diff --git a/Passwords/passwords_youporn2012.txt b/Passwords/passwords_youporn2012.txt
index c499dd69..594946e9 100644
--- a/Passwords/passwords_youporn2012.txt
+++ b/Passwords/passwords_youporn2012.txt
@@ -4061,7 +4061,4 @@ lolol123
 hello2
 hooligan1
 joker666
-hielox
-<<<<<<< HEAD
-=======
 hielox