Fixed: Conflicting migrations detected (0004_userinstance_is_vnc, 0007_auto_20160426_0635 in accounts)

accounts/migrations/0008_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0004_userinstance_is_vnc'),
+        ('accounts', '0007_auto_20160426_0635'),
+    ]
+
+    operations = [
+    ]