diff --git a/spiffworkflow-backend/bin/recreate_db b/spiffworkflow-backend/bin/recreate_db
index 4535d6f4..5af0209c 100755
--- a/spiffworkflow-backend/bin/recreate_db
+++ b/spiffworkflow-backend/bin/recreate_db
@@ -28,6 +28,9 @@ if [[ -n "${SPIFFWORKFLOW_BACKEND_DATABASE_URI:-}" ]]; then
   database_host=$(grep -oP "^[^:]+://.*@\K(.+?)[:/]" <<<"$SPIFFWORKFLOW_BACKEND_DATABASE_URI" | sed -E 's/[:\/]$//')
 fi
 
+# this will fix branching conflicts
+# poetry run flask db merge heads -m "merging two heads"
+
 tasks=""
 if [[ "${1:-}" == "clean" ]]; then
   subcommand="${2:-}"
diff --git a/spiffworkflow-backend/migrations/versions/1073364bc015_merging_two_heads.py b/spiffworkflow-backend/migrations/versions/1073364bc015_merging_two_heads.py
new file mode 100644
index 00000000..8bbdb839
--- /dev/null
+++ b/spiffworkflow-backend/migrations/versions/1073364bc015_merging_two_heads.py
@@ -0,0 +1,24 @@
+"""merging two heads
+
+Revision ID: 1073364bc015
+Revises: 214e0c5fb418, 5c50ecf2c1cd, ebf5e733d109
+Create Date: 2023-08-21 13:22:36.060366
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '1073364bc015'
+down_revision = ('214e0c5fb418', '5c50ecf2c1cd', 'ebf5e733d109')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass