diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index cbff04f..8306744 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,9 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-<<<<<<< HEAD
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-=======
->>>>>>> cea68f2 (Support for win32)
   </component>
 </project>
\ No newline at end of file