diff --git a/gravity.sh b/gravity.sh
index d4298a31..f4f075ad 100755
--- a/gravity.sh
+++ b/gravity.sh
@@ -319,13 +319,8 @@ gravity_reload() {
 	#First escape forward slashes in the path:
 	adList=${adList//\//\\\/}
 	#Now replace the line in dnsmasq file
-<<<<<<< HEAD
 #	sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf
 
-=======
-	sed -i "s/^addn-hosts.*/addn-hosts=$adList/" /etc/dnsmasq.d/01-pihole.conf
->>>>>>> upstream/promoTweaksTheSecond
-
         pihole restartdns
 }