diff --git a/constance/admin.py b/constance/admin.py
index 2747813a..7d5acfa0 100644
--- a/constance/admin.py
+++ b/constance/admin.py
@@ -173,7 +173,6 @@ def clean(self):
         return cleaned_data
 
 
->>>>>>> upstream/master
 class ConstanceAdmin(admin.ModelAdmin):
     change_list_template = 'admin/constance/change_list.html'
     change_list_form = ConstanceForm
diff --git a/constance/management/commands/constance.py b/constance/management/commands/constance.py
index dc35cff1..c307887e 100644
--- a/constance/management/commands/constance.py
+++ b/constance/management/commands/constance.py
@@ -5,7 +5,8 @@
 from django.utils.translation import gettext as _
 
 from ... import config
-from ...admin import ConstanceForm, get_values
+from ...forms import ConstanceForm
+from ...utils import get_values
 from ...models import Constance