diff --git a/README.md b/README.md
index 5bb1216..b485b62 100644
--- a/README.md
+++ b/README.md
@@ -32,12 +32,8 @@ tracker_bot = Udon
 auth_msg = BOT #oppaitime-announce iou1name SpaghettiIsAFaggot
 watch_dir = /home/iou1name/torrent/oppaitime/Watch/
 cookies_txt = cookies.txt
-<<<<<<< HEAD
-tags = English,Dual Language,subs
-blacklist = Loose
-=======
 tags = [English,!Manga],[Manga,English,Archived],[Dual Language],[Softsubs]
->>>>>>> logictags
+blacklist = Loose
 
 [redacted]
 server = irc.scratch-network.net