diff --git a/catalog/catalog.json b/catalog/catalog.json
index 0cd440b25090f1190753b88ac6c67ea8dd1220aa..12dade7382ae5dd9d4645ac8b7de07f555a5f115 100644
--- a/catalog/catalog.json
+++ b/catalog/catalog.json
@@ -317,7 +317,6 @@
     {
       "rel": "child",
       "href": "./cprep/collection.json",
->>>>>>> catalog/catalog.json
       "type": "application/json"
     }
   ]