diff --git a/lib/vscode/src/vs/platform/storage/common/storage.ts b/lib/vscode/src/vs/platform/storage/common/storage.ts
index 8ff83d59..48f3829c 100644
--- a/lib/vscode/src/vs/platform/storage/common/storage.ts
+++ b/lib/vscode/src/vs/platform/storage/common/storage.ts
@@ -480,11 +480,7 @@ export abstract class AbstractStorageService extends Disposable implements IStor
 
 	// --- abstract
 
-<<<<<<< HEAD
-	protected abstract doStore(key: string, value: string | boolean | number, scope: StorageScope): Promise<void> | void;
-=======
 	protected abstract doInitialize(): Promise<void>;
->>>>>>> e8cd17a97d8c58fffcbac05394b3ee2b3c72d384
 
 	protected abstract getStorage(scope: StorageScope): IStorage | undefined;