diff --git a/dbVersion.json b/dbVersion.json
index 4217bb4..f10f974 100644
--- a/dbVersion.json
+++ b/dbVersion.json
@@ -22,11 +22,8 @@
     {"file": "20180928-1.sql", "version": 20},
     {"file": "20181001-1.sql", "version": 21},
     {"file": "20181010-1.sql", "version": 22},
-<<<<<<< Updated upstream
-    {"file": "20190305-1.sql", "version": 23}
-=======
-    {"file": "20190522-1.sql", "version": 23}
->>>>>>> Stashed changes
+    {"file": "20190305-1.sql", "version": 23},
+    {"file": "20190522-1.sql", "version": 24}
   ],
   "test": []
 }
\ No newline at end of file