fixes migration conflict

package-lock.json

@@ -1301,6 +1301,25 @@
         "jquery": ">=1.7"
       }
     },
+    "datatables.net-select": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/datatables.net-select/-/datatables.net-select-1.3.1.tgz",
+      "integrity": "sha512-PeVd/hlAX58QzL0+mGvxnXP7ylLtzZMeAots/uZkQi+6c/KI6JuP8LCJoEMHAsSjQM/BnG7Uw8E1YGOz1tZpQQ==",
+      "requires": {
+        "datatables.net": "^1.10.15",
+        "jquery": ">=1.7"
+      }
+    },
+    "datatables.net-select-bs4": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/datatables.net-select-bs4/-/datatables.net-select-bs4-1.3.1.tgz",
+      "integrity": "sha512-8UOBxChTsn24nP/ZOsIMGZOdTJymQZ8WcQ81NcGgyDz6b4JlsQl8Bwb89AcVT7hncMquPJ3d5WUGG4I9WMhAlw==",
+      "requires": {
+        "datatables.net-bs4": "^1.10.15",
+        "datatables.net-select": "1.3.1",
+        "jquery": ">=1.7"
+      }
+    },
     "date-now": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",

portal/migrations/0017_merge_20191105_1101.py

+# Generated by Django 2.0.13 on 2019-11-05 16:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('portal', '0016_auto_20191016_1043'),
+        ('portal', '0015_auto_20191011_1634'),
+    ]
+
+    operations = [
+    ]