fix merge conflict

core/migrations/0006_auto_20191115_1409.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.17 on 2019-11-15 07:09
+from __future__ import unicode_literals
+
+import core.lib.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_merge_20191115_1314'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='student',
+            name='student_gpa',
+            field=models.FloatField(blank=True, db_column=b'student_gpa', default=1.0, null=True, validators=[core.lib.validators.validate_student_gpa]),
+        ),
+    ]