Resolve model conflicts

webapp/migrations/0009_merge_20170607_1854.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-06-07 15:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0008_auto_20170607_1828'),
+        ('webapp', '0004_auto_20170607_1826'),
+    ]
+
+    operations = [
+    ]