Fix migration conflict

kfet/migrations/0057_merge.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('kfet', '0057_add_perms_config'),
         ('kfet', '0056_change_account_meta'),
         ('kfet', '0054_update_promos'),
     ]

kfet/migrations/0058_amend_supplier.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('kfet', '0057_add_perms_config'),
+        ('kfet', '0057_merge'),
     ]
 
     operations = [