diff --git a/license-list-data/exceptions-3.23.json b/license-list-data/exceptions-3.23.json
index e2ad7282499..1f21b7618f6 100644
--- a/license-list-data/exceptions-3.23.json
+++ b/license-list-data/exceptions-3.23.json
@@ -769,4 +769,8 @@
     }
   ],
   "releaseDate": "2024-02-08"
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> d0ec5d6ce (Update licence list)
diff --git a/license-list-data/licenses-3.23.json b/license-list-data/licenses-3.23.json
index 884a5e62d59..77189c62272 100644
--- a/license-list-data/licenses-3.23.json
+++ b/license-list-data/licenses-3.23.json
@@ -7994,4 +7994,8 @@
     }
   ],
   "releaseDate": "2024-02-08"
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> d0ec5d6ce (Update licence list)