diff --git a/setup.py b/setup.py
index 9591651..83c9537 100755
--- a/setup.py
+++ b/setup.py
@@ -35,9 +35,5 @@ setup(name='pappyproxy',
           'Programming Language :: Python :: 2.7',
           'License :: OSI Approved :: MIT License',
           'Topic :: Security',
-<<<<<<< HEAD
-          'Topic :: Security :: Pwning Ur Mum',
-=======
->>>>>>> master
         ]
 )