diff --git a/test/lib/linter/snapshots/linter.ts.md b/test/lib/linter/snapshots/linter.ts.md
index 9d2fb2ec1..507a10944 100644
--- a/test/lib/linter/snapshots/linter.ts.md
+++ b/test/lib/linter/snapshots/linter.ts.md
@@ -756,19 +756,7 @@ Generated by [AVA](https://avajs.dev).
     [
       {
         coverageInfo: [],
-<<<<<<< HEAD
-        errorCount: 1,
-=======
-        errorCount: 0,
-        fatalErrorCount: 0,
-        filePath: 'webapp/Component.js',
-        messages: [],
-        warningCount: 0,
-      },
-      {
-        coverageInfo: [],
         errorCount: 2,
->>>>>>> 97ea3f8 (feat: Add tests)
         fatalErrorCount: 0,
         filePath: 'webapp/controller/App.controller.js',
         messages: [
diff --git a/test/lib/linter/snapshots/linter.ts.snap b/test/lib/linter/snapshots/linter.ts.snap
index 4dafd76ff..671489ea8 100644
Binary files a/test/lib/linter/snapshots/linter.ts.snap and b/test/lib/linter/snapshots/linter.ts.snap differ