diff --git a/.gitignore b/.gitignore
index e7f9785..3198785 100644
--- a/.gitignore
+++ b/.gitignore
@@ -168,15 +168,13 @@ deploy/dock_ws/log
 deploy/dock_ws/install
 deploy/dock_ws/build
 
-<<<<<<< HEAD
 deploy/nav2_ws/install
 deploy/nav2_ws/log
-=======
+
 *build*
 *install*
 *log*
 *lib*
->>>>>>> Added simulation and locomotion files
 
 _isaac_sim
 .vscode
diff --git a/.gitmodules b/.gitmodules
index 4729307..18aaa6b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
 [submodule "mjsim_quad"]
 	path = mjsim_quad
-<<<<<<< HEAD
 	url = git@github.com:nimesh00/mjsim_quad.git
-=======
-	url = https://github.com/nimesh00/mjsim_quad.git
->>>>>>> cleanup locomotion and add standalone simulation project (mjsim_quad)