diff --git a/extensions/markdown/src/features/previewContentProvider.ts b/extensions/markdown/src/features/previewContentProvider.ts
index 2768af810d7..433d55aaed1 100644
--- a/extensions/markdown/src/features/previewContentProvider.ts
+++ b/extensions/markdown/src/features/previewContentProvider.ts
@@ -285,10 +285,7 @@ class MarkdownPreview {
 	private throttleTimer: any;
 	private initialLine: number | undefined = undefined;
 	private readonly disposables: vscode.Disposable[] = [];
-<<<<<<< HEAD
 	private firstUpdate = true;
-=======
->>>>>>> Scroll sync markdown editor with markdown preview
 	private currentVersion?: { resource: vscode.Uri, version: number };
 
 	constructor(