diff --git a/setup.py b/setup.py
index ac2f5095c..b77ff428e 100644
--- a/setup.py
+++ b/setup.py
@@ -40,11 +40,7 @@
 
 setup(
     name='Jinja2',
-<<<<<<< HEAD
     version='2.10.dev',
-=======
-    version='2.9.7.dev',
->>>>>>> 2.9-maintenance
     url='http://jinja.pocoo.org/',
     license='BSD',
     author='Armin Ronacher',