diff --git a/setup.py b/setup.py
index 3b62ce78..fd3300c4 100644
--- a/setup.py
+++ b/setup.py
@@ -2,11 +2,7 @@
 
 setup(
     name='django-froala-editor',
-<<<<<<< HEAD
     version='2.8.5',
-=======
-    version='2.8.4-2',
->>>>>>> 065a5b2f9f7e3e824725c9903ce58ca47ded1007
     author='Dipesh Acharya',
     author_email='xtranophilist@gmail.com',
     maintainer='Froala Labs',