merge migrations

rust/migrations/20230519222555_initial.sql

@@ -51,6 +51,7 @@ CREATE TABLE trips_items (
     trip_id VARCHAR(36) NOT NULL,
     pick BOOLEAN NOT NULL,
     pack BOOLEAN NOT NULL,
+    new BOOLEAN NOT NULL,
     PRIMARY KEY (item_id, trip_id),
     FOREIGN KEY(item_id) REFERENCES "inventory_items" (id),
     FOREIGN KEY(trip_id) REFERENCES "trips" (id)

rust/migrations/20230520131340_1.sql

@@ -1,2 +0,0 @@
--- Add migration script here
-ALTER TABLE "trips_items" ADD COLUMN new BOOLEAN NOT NULL;