diff --git a/spiffworkflow-backend/bin/wait_for_db_schema_migrations b/spiffworkflow-backend/bin/wait_for_db_schema_migrations
old mode 100644
new mode 100755
diff --git a/spiffworkflow-frontend/package-lock.json b/spiffworkflow-frontend/package-lock.json
index a04034f81..2045389d1 100644
--- a/spiffworkflow-frontend/package-lock.json
+++ b/spiffworkflow-frontend/package-lock.json
@@ -31216,11 +31216,7 @@
       }
     },
     "bpmn-js-spiffworkflow": {
-<<<<<<< HEAD
       "version": "git+ssh://git@github.com/sartography/bpmn-js-spiffworkflow.git#fd7a9489d86bd9a8bd0f8c84eeba37c234443951",
-=======
-      "version": "git+ssh://git@github.com/sartography/bpmn-js-spiffworkflow.git#7f7707838acc30d03fae907bb72f5bec101882b5",
->>>>>>> origin/main
       "from": "bpmn-js-spiffworkflow@github:sartography/bpmn-js-spiffworkflow#main",
       "requires": {
         "inherits": "^2.0.4",