diff --git a/datasets/marsh-ida.data.mdx b/datasets/marsh-ida.data.mdx
index 5a140a169..3965fe797 100644
--- a/datasets/marsh-ida.data.mdx
+++ b/datasets/marsh-ida.data.mdx
@@ -39,7 +39,6 @@ layers:
           label: Non-Salt Marsh
         - color: "#d73027"
           label: Salt Marsh
-<<<<<<< HEAD
     compare:
       datasetId: marsh-ida
       layerId: marsh-ida
@@ -54,13 +53,7 @@ layers:
       unit: Binary
 
 
-  - id: marsh-difference
-=======
-    compare:
-        datasetId: marsh-ida
-        layerId: marsh-ida
 - id: marsh-difference
->>>>>>> b611d40609b01159efe8b4f75d276a7cf6257ced
     stacCol: marsh-difference
     name: Salt Marsh Difference
     type: raster