diff --git a/.github/workflows/data/noaa-emergency-response.json b/.github/workflows/data/noaa-emergency-response.json
index 0daf190f..9bcb8dd3 100644
--- a/.github/workflows/data/noaa-emergency-response.json
+++ b/.github/workflows/data/noaa-emergency-response.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "id": "noaa-emergency-response",
   "title": "NOAA Emergency Response Imagery",
   "description": "NOAA Emergency Response Imagery hosted on AWS Public Dataset.",
@@ -11,6 +12,33 @@
     },
     "temporal": {
       "interval": [["2005-01-01T00:00:00Z", null]]
+=======
+    "id": "noaa-emergency-response",
+    "title": "NOAA Emergency Response Imagery",
+    "description": "NOAA Emergency Response Imagery hosted on AWS Public Dataset.",
+    "stac_version": "1.0.0",
+    "license": "public-domain",
+    "links": [],
+    "extent": {
+        "spatial": {
+            "bbox": [
+                [
+                    -180,
+                    -90,
+                    180,
+                    90
+                ]
+            ]
+        },
+        "temporal": {
+            "interval": [
+                [
+                    "2005-01-01T00:00:00Z",
+                    null
+                ]
+            ]
+        }
+>>>>>>> 23d3b936e8d8fc705ee06754ac74b654262030a1
     }
   },
   "eic:tenant": "emergency"
diff --git a/docker-compose.yml b/docker-compose.yml
index cfc77e07..0edad500 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,12 +29,16 @@ services:
       # https://github.com/developmentseed/eoAPI/issues/16
       # - TITILER_ENDPOINT=raster
       - TITILER_ENDPOINT=http://0.0.0.0:8082
+<<<<<<< HEAD
       - VEDA_STAC_ROOT_PATH=/api/stac
       - VEDA_STAC_OPENID_CONFIGURATION_URL=http://localhost:8888/.well-known/openid-configuration
       - VEDA_STAC_OPENID_CONFIGURATION_INTERNAL_URL=http://oidc:8888/.well-known/openid-configuration
       - VEDA_STAC_ENABLE_TRANSACTIONS=True
       - VEDA_STAC_GIT_SHA=local123
       - VEDA_STAC_ENABLE_STAC_AUTH_PROXY=True
+=======
+      - VEDA_STAC_ENABLE_TRANSACTIONS=True
+>>>>>>> 23d3b936e8d8fc705ee06754ac74b654262030a1
     depends_on:
       - database
       - raster
diff --git a/scripts/run-local-tests.sh b/scripts/run-local-tests.sh
index 68c23d3a..88fb3347 100755
--- a/scripts/run-local-tests.sh
+++ b/scripts/run-local-tests.sh
@@ -46,4 +46,4 @@ NO_PYDANTIC_SSM_SETTINGS=1 python -m pytest --cov=ingest_api/runtime/src ingest_
 
 # Transactions tests
 echo "--- Running stac api runtime tests ---"
-python -m pytest stac_api/runtime/tests/ --asyncio-mode=auto -vv -s -p no:warnings
\ No newline at end of file
+python -m pytest stac_api/runtime/tests/ --asyncio-mode=auto -vv -s -p no:warnings