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