diff --git a/packages/jest-serializer/src/__tests__/index.test.ts b/packages/jest-serializer/src/__tests__/index.test.ts
index a9454ceea4f3..dc5ed74475a2 100644
--- a/packages/jest-serializer/src/__tests__/index.test.ts
+++ b/packages/jest-serializer/src/__tests__/index.test.ts
@@ -10,8 +10,11 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
+<<<<<<< HEAD
 import v8 from 'v8';
 import prettyFormat from 'pretty-format';
+=======
+>>>>>>> Fix lint
 
 import serializer from '..';