diff --git a/.gitmodules b/.gitmodules
index 5309e9a7..562103ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,4 +19,3 @@
 [submodule "external/hibou-shipbox"]
 	path = external/hibou-shipbox
 	url = https://gitlab.com/hibou-io/hibou-odoo/shipbox.git
->>>>>>> .gitmodules