diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py
index 884d67f..d1c07af 100644
--- a/adminsortable/__init__.py
+++ b/adminsortable/__init__.py
@@ -1,9 +1,5 @@
-<<<<<<< Updated upstream
-VERSION = (2, 0, 12)
-=======
 VERSION = (2, 0, 14)
->>>>>>> Stashed changes
-DEV_N = None
+DEV_N = None
 
 
 def get_version():