From fe8dffdcd3986a6a0d67b06eb21263f28f5916a1 Mon Sep 17 00:00:00 2001
From: Neal Beeken <neal.beeken@mongodb.com>
Date: Thu, 3 Dec 2020 18:37:11 -0500
Subject: [PATCH] rebase fixes

---
 src/cmap/connection.ts | 6 +++---
 src/index.ts           | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/cmap/connection.ts b/src/cmap/connection.ts
index 6efaaa5bd1f..fb8a3356abc 100644
--- a/src/cmap/connection.ts
+++ b/src/cmap/connection.ts
@@ -280,17 +280,17 @@ export class Connection extends EventEmitter {
   }
 
   /** @internal */
-  insert(ns: string, ops: Document[], options: InsertOptions, callback: Callback): void {
+  insert(ns: string, ops: Document[], options: WriteCommandOptions, callback: Callback): void {
     wp.insert(makeServerTrampoline(this), ns, ops, options, callback);
   }
 
   /** @internal */
-  update(ns: string, ops: Document[], options: UpdateOptions, callback: Callback): void {
+  update(ns: string, ops: Document[], options: WriteCommandOptions, callback: Callback): void {
     wp.update(makeServerTrampoline(this), ns, ops, options, callback);
   }
 
   /** @internal */
-  remove(ns: string, ops: Document[], options: RemoveOptions, callback: Callback): void {
+  remove(ns: string, ops: Document[], options: WriteCommandOptions, callback: Callback): void {
     wp.remove(makeServerTrampoline(this), ns, ops, options, callback);
   }
 }
diff --git a/src/index.ts b/src/index.ts
index cb2570e4e8d..c963c46506b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -140,7 +140,6 @@ export type { CompressorName, Compressor } from './cmap/wire_protocol/compressio
 export type { GetMoreOptions } from './cmap/wire_protocol/get_more';
 export type { QueryOptions } from './cmap/wire_protocol/query';
 export type { CollationOptions, WriteCommandOptions } from './cmap/wire_protocol/write_command';
-export type { QueryOptions } from './cmap/wire_protocol/query';
 export type { CollectionPrivate, CollectionOptions } from './collection';
 export type { AggregationCursorOptions } from './cursor/aggregation_cursor';
 export type {