diff --git a/gravity-adv.sh b/gravity-adv.sh
index 5b1f76da..1c234530 100755
--- a/gravity-adv.sh
+++ b/gravity-adv.sh
@@ -29,29 +29,9 @@ echo "Getting someone who cares ad list..."
 curl -s http://someonewhocares.org/hosts/hosts | grep -v "#" | sed '/^$/d' | sed 's/\ /\\ /g' | awk '{print $2}' >> /tmp/matter.txt
 
 # Sort the aggregated results and remove any duplicates
-#<<<<<<< Updated upstream
 echo "removing duplicates and formatting to address=/<ad domain>/"$piholeIP
 cat /tmp/matter.txt | sort | uniq | sed '/^$/d' | awk -v "IP=$piholeIP" '{sub(/\r$/,""); print "address=/"$0"/"IP}' > /tmp/andLight.txt
 mv /tmp/andLight.txt $eventHorizion
-=======
-echo "Sorting and removing duplicates..."
-cat /tmp/matter.txt | sort | uniq | sed '/^$/d' > /tmp/andLight.txt
-
-# Read the file, prepend "address=/", and append the IP of the Raspberry Pi
-# This creates a correctly-formatted config file
-while read fermion
-do
-	boson=$(echo "$fermion" | tr -d '\r')
-	# WHITELSISTING
-	case $boson in
-		# Change these domains below to whitelist a site (will show ads)
-		jacobsalmela.com) echo "--------WHITELISTED $boson";;
-		lifehacker.com) echo "--------WHITELISTED $boson";;
-		*) echo "address=/$boson/$piholeIP" >> $eventHorizion;
-			echo "Added $boson...";;
-	esac	
-done </tmp/andLight.txt
->>>>>>> Stashed changes
 
 # Restart DNS
-service dnsmasq restart
+service dnsmasq restart
\ No newline at end of file