diff --git a/composer.lock b/composer.lock
index afbac27..1d9e50d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -565,11 +565,19 @@
         },
         {
             "name": "boboko/core",
+<<<<<<< HEAD
             "version": "0.3.0",
             "source": {
                 "type": "git",
                 "url": "https://code.radical-elements.com/boboko/core.git",
                 "reference": "4c003690058ee37e2789ff95a68391a1818f3f63"
+=======
+            "version": "0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://code.radical-elements.com/boboko/core.git",
+                "reference": "0524380ab0922729d177e7bf000c61be1fba440a"
+>>>>>>> ace8290 (composer lock)
             },
             "require": {
                 "laravel/framework": "^12.0",
@@ -607,7 +615,7 @@
                 }
             },
             "description": "Core module — authentication and shared panel behaviour",
-            "time": "2026-07-12T02:38:14+00:00"
+            "time": "2026-07-10T12:21:42+00:00"
         },
         {
             "name": "brick/math",