merge conflicting migrations

roundabout/calibrations/migrations/0033_merge_20210610_1729.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.1.3 on 2021-06-10 17:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('calibrations', '0030_auto_20210609_0619'),
+        ('calibrations', '0032_auto_20210512_1452'),
+    ]
+
+    operations = [
+    ]

roundabout/configs_constants/migrations/0028_merge_20210610_1729.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.1.3 on 2021-06-10 17:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('configs_constants', '0027_auto_20210514_1635'),
+        ('configs_constants', '0024_auto_20210609_0619'),
+    ]
+
+    operations = [
+    ]

roundabout/inventory/migrations/0069_merge_20210610_1728.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.1.3 on 2021-06-10 17:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0068_auto_20210609_0619'),
+        ('inventory', '0068_auto_20210512_1446'),
+    ]
+
+    operations = [
+    ]