resolve migration conflict

bda/migrations/0013_merge_20180524_2123.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.13 on 2018-05-24 19:23
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bda', '0012_notif_time'),
+        ('bda', '0012_swap_double_choice'),
+    ]
+
+    operations = [
+    ]