diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 113f660..a933e05 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,9 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-<<<<<<< HEAD
     <mapping directory="$PROJECT_DIR$/gym" vcs="Git" />
-=======
->>>>>>> develop
   </component>
 </project>
\ No newline at end of file