diff --git a/README.md b/README.md
index b024e127ccf7db6f2a5131dfb4ee20769904b986..66a090fa24199ddcd24d6ed67926278552a65f74 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # vMap
 
 vMap is a powerfull webmapping application based on the newest open-source libraries (OpenLayers 3, Google-Closure, AngularJS, Bootstrap…).
@@ -23,6 +22,3 @@ To install the dev version of this project run the following steps:
 - Run install.sh and give the var/www/[app name] path when asked to build your tree structure
 - Now you have the correct versioned tree structure, rename var/www/[app name] as var/www/[app name]\_vai and var/www/[app name]\_dev as var/www/[app name]
 - Run `git pull` and `git push` to update/post the project and his dependencies
-=======
-Module ANC 2018.03.00 for Vitis
->>>>>>> 3ce44dcc... Squashed 'src/module_anc/' changes from 4321adc4..8bb35778