diff --git a/license-list-data/exceptions-3.23.json b/license-list-data/exceptions-3.23.json
index 1f21b7618f6..774f2632e6e 100644
--- a/license-list-data/exceptions-3.23.json
+++ b/license-list-data/exceptions-3.23.json
@@ -769,8 +769,4 @@
     }
   ],
   "releaseDate": "2024-02-08"
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> d0ec5d6ce (Update licence list)
diff --git a/license-list-data/licenses-3.23.json b/license-list-data/licenses-3.23.json
index 77189c62272..ab676e4ef7c 100644
--- a/license-list-data/licenses-3.23.json
+++ b/license-list-data/licenses-3.23.json
@@ -7994,8 +7994,4 @@
     }
   ],
   "releaseDate": "2024-02-08"
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> d0ec5d6ce (Update licence list)