diff --git a/.gitmodules b/.gitmodules
index e17a7c00895b772f69e98820d9d673f01d1bea43..9e3672964ba4ba331c81e5220ab28be991f2a5af 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "theme"]
 	path = theme
+<<<<<<< HEAD
     url = https://git-r3lab.uni.lu/R3/outreach/theme.git
+
+
+>>>>>>> change url of theme