Fixup

Author: vmcj

.github/workflows/database-upgrade.yml

@@ -1,14 +1,7 @@
 name: Database Upgrade Test
 
 on:
-<<<<<<< HEAD
   merge_group:
-=======
-  push:
-    branches:
-      - main
-      - '[0-9]+.[0-9]+'
->>>>>>> 68438a63c (Update CI to check old db upgrade)
   pull_request:
     branches:
       - main