diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72cca928724a35f9987a4ffeb8a48cc7679a75cd..ece4261c5626617dbbc1bf567b08f7203fecdf62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Upcoming version:
 -----------------
+  - merged (Nikolaus Krismer)
   - version upgrade of apache-tomcat (Nikolaus Krismer)
   - version upgrade of apache-tomcat (Nikolaus Krismer)
   - version upgrade of apache-tomcat (Nikolaus Krismer)
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index 954211505b17937f93484ae45d526139434463a8..f4c524184ea1420fd7e4877e0b788dd6ed180b39 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -792,11 +792,7 @@ fi
 
 if $INSTALL_SPATIALITE_ADMIN; then
 	# TODO: Check this (does not seem to work)
-<<<<<<< HEAD
 	# TODO: What to do if there are multiple target_srid defined?
-=======
-	# TODO: What to do if there are multiple target_srid defined
->>>>>>> 8b36dab25de690b11838ff650c718406021fcf6a
 	fn_echo "Configuring phpLiteAdmin"
 	cp $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.sample.php $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
 	sed -i "s/password = 'admin'/password = '${TOMCAT_PASSWORD}'/" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php