diff --git a/.gitmodules b/.gitmodules
index 053755f..43b9c6a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
 [submodule "themes/hexon-hugo-theme"]
 	path = themes/hexon-hugo-theme
-<<<<<<< HEAD
 	url = git@github.com:OdinsPlasmaRifle/hexon-hugo-theme.git
-=======
-	url = https://github.com/OdinsPlasmaRifle/hexon-hugo-theme.git
->>>>>>> 352468ee464880e3a784cf2ad787f278d79c94a6