diff --git a/src/web/media.ts b/src/web/media.ts
index 18a8542cab8..95887cbb0b0 100644
--- a/src/web/media.ts
+++ b/src/web/media.ts
@@ -32,7 +32,6 @@ type WebMediaOptions = {
   readFile?: (filePath: string) => Promise<Buffer>;
 };
 
-<<<<<<< HEAD
 export function getDefaultLocalRoots(): string[] {
   return [
     os.tmpdir(),