1606834604 resolve migrations conflict

core/migrations/0037_merge_20191009_0729.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.17 on 2019-10-09 00:29
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0021_auto_20191009_0654'),
+        ('core', '0036_merge_20191008_2324'),
+    ]
+
+    operations = [
+    ]