diff --git a/MANIFEST.in b/MANIFEST.in
index cb6994a..265d617 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,4 @@
 include version.py
 include CHANGELOG.rst CONTRIBUTORS.rst LICENSE
-<<<<<<< HEAD
 include rtv.1
-=======
 include rtv/templates/*
->>>>>>> 28d17b28d0840f75386586686897e9316378150e
diff --git a/setup.py b/setup.py
index dd14eb4..2506e16 100644
--- a/setup.py
+++ b/setup.py
@@ -21,12 +21,8 @@ setup(
     keywords='reddit terminal praw curses',
     packages=['rtv'],
     include_package_data=True,
-<<<<<<< HEAD
     data_files=[("share/man/man1", ["rtv.1"])],
-    install_requires=['praw>=3.1.0', 'six', 'requests', 'kitchen'],
-=======
     install_requires=requirements,
->>>>>>> 28d17b28d0840f75386586686897e9316378150e
     entry_points={'console_scripts': ['rtv=rtv.__main__:main']},
     classifiers=[
         'Intended Audience :: End Users/Desktop',