Merged migrations conflict

app/migrations/0024_merge_20201026_0812.py

+# Generated by Django 3.1 on 2020-10-26 01:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0023_merge_20201016_1713'),
+        ('app', '0023_materi_deleted_at'),
+    ]
+
+    operations = [
+    ]