diff --git a/.gitignore b/.gitignore
index 00c5d06..66bde92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
-<<<<<<< HEAD
 .vscode
-=======
+
 devel/
 logs/
 build/
@@ -19,9 +18,6 @@ msg/_*.py
 build_isolated/
 devel_isolated/
 
-# Webots temporary files
-scout_webots_sim/worlds/.scout_base.wbproj
-
 # Generated by dynamic reconfigure
 *.cfgc
 /cfg/cpp/
@@ -58,4 +54,3 @@ qtcreator-*
 
 # Catkin custom files
 CATKIN_IGNORE
->>>>>>> scout_sim