diff --git a/.betterer.results b/.betterer.results
index 8862d56c298..7a36a4d05bf 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2437,17 +2437,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/features/dashboard-scene/utils/DashboardModelCompatibilityWrapper.ts:5381": [
-<<<<<<< HEAD
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"]
-||||||| eb8dfe7933d
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Do not use any type assertions.", "1"],
-      [0, 0, 0, "Do not use any type assertions.", "2"],
-      [0, 0, 0, "Do not use any type assertions.", "3"]
-=======
       [0, 0, 0, "Do not use any type assertions.", "0"]
->>>>>>> 6073626683dd3e9f437a533ef55fd79baaceb982
     ],
     "public/app/features/dashboard-scene/utils/test-utils.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],