diff --git a/adminsortable/__init__.py b/adminsortable/__init__.py
index 624e90a..25cbabc 100644
--- a/adminsortable/__init__.py
+++ b/adminsortable/__init__.py
@@ -1,8 +1,4 @@
-<<<<<<< Updated upstream
-VERSION = (2, 0, 8)  # following PEP 386
-=======
-VERSION = (2, 0, 10)  # following PEP 386
->>>>>>> Stashed changes
+VERSION = (2, 0, 10)
 DEV_N = None
 
 
diff --git a/adminsortable/admin.py b/adminsortable/admin.py
index 6cf05e7..5b47b96 100755
--- a/adminsortable/admin.py
+++ b/adminsortable/admin.py
@@ -29,7 +29,7 @@ from django.template.defaultfilters import capfirst
 
 from adminsortable.fields import SortableForeignKey
 from adminsortable.models import SortableMixin
-from adminsortable.utils import get_is_sortable, check_model_is_sortable
+from adminsortable.utils import get_is_sortable
 
 STATIC_URL = settings.STATIC_URL