Fix database conflict

checklist/migrations/0007_checklistcategory_checklistcategory.py

-# Generated by Django 2.1.3 on 2018-12-17 17:59
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('checklist', '0006_auto_20181217_1833'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='checklistcategory',
-            name='checklistCategory',
-            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.SET_DEFAULT, to='checklist.CheckListCategory'),
-        ),
-    ]

checklist/migrations/0008_auto_20181217_1904.py → checklist/migrations/0007_checklistcategory_wikientry.py

-# Generated by Django 2.1.3 on 2018-12-17 18:04
+# Generated by Django 2.1.3 on 2018-12-17 18:07
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -8,14 +8,10 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('wiki', '0001_initial'),
-        ('checklist', '0007_checklistcategory_checklistcategory'),
+        ('checklist', '0006_auto_20181217_1833'),
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name='checklistcategory',
-            name='checklistCategory',
-        ),
         migrations.AddField(
             model_name='checklistcategory',
             name='wikiEntry',