diff --git a/composer.lock b/composer.lock
index 6ad74d1..a57cf3c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1567,11 +1567,7 @@
                 "issues": "https://github.com/Kwaadpepper/crud-policies/issues",
                 "source": "https://github.com/Kwaadpepper/crud-policies/tree/0.4.5"
             },
-<<<<<<< HEAD
-            "time": "2022-06-15T15:19:14+00:00"
-=======
             "time": "2022-06-15T15:42:22+00:00"
->>>>>>> origin/ticket928
         },
         {
             "name": "kwaadpepper/enum",