diff --git a/modules/features/graphicalEditor/nodeDefinitions/context.py b/modules/features/graphicalEditor/nodeDefinitions/context.py
index e38e5366..3171f58a 100644
--- a/modules/features/graphicalEditor/nodeDefinitions/context.py
+++ b/modules/features/graphicalEditor/nodeDefinitions/context.py
@@ -40,15 +40,9 @@ CONTEXT_NODES = [
         ),
         "injectRunContext": True,
         "parameters": [
-<<<<<<< HEAD
             {"name": "context", "type": "Any", "required": False, "frontendType": "contextBuilder",
              "description": CONTEXT_BUILDER_PARAM_DESCRIPTION, "default": "",
              "graphInherit": {"port": 0, "kind": "primaryTextRef"}},
-=======
-            {"name": "documentList", "type": "str", "required": True, "frontendType": "hidden",
-             "description": t("Dokumentenliste (via Wire oder DataRef)"), "default": "",
-             "graphInherit": {"port": 0, "kind": "documentListWire"}},
->>>>>>> 513ded84d529502d07a04d199df3f873f263cff0
             {
                 "name": "contentFilter",
                 "type": "str",
diff --git a/modules/workflows/methods/methodContext/actions/extractContent.py b/modules/workflows/methods/methodContext/actions/extractContent.py
index 8a23e400..f6674124 100644
--- a/modules/workflows/methods/methodContext/actions/extractContent.py
+++ b/modules/workflows/methods/methodContext/actions/extractContent.py
@@ -1751,7 +1751,6 @@ def presentation_envelopes_to_document_json(
     }
 
 
-<<<<<<< HEAD
 def _document_list_from_context(raw: Any, *, _depth: int = 0) -> DocumentReferenceList:
     """Best-effort extraction of document/file references from ``context`` payloads.
 
@@ -1808,8 +1807,6 @@ def _document_list_from_context(raw: Any, *, _depth: int = 0) -> DocumentReferen
     return DocumentReferenceList(references=deduped)
 
 
-=======
->>>>>>> 513ded84d529502d07a04d199df3f873f263cff0
 async def extractContent(self, parameters: Dict[str, Any]) -> ActionResult:
     operation_id = None
     try:
@@ -1817,7 +1814,6 @@ async def extractContent(self, parameters: Dict[str, Any]) -> ActionResult:
         operation_id = f"context_extract_{wf}_{int(time.time())}"
 
         document_list_param = parameters.get("documentList")
-<<<<<<< HEAD
         if document_list_param:
             dl = coerceDocumentReferenceList(document_list_param)
             source = "documentList"
@@ -1836,20 +1832,6 @@ async def extractContent(self, parameters: Dict[str, Any]) -> ActionResult:
                 ),
             )
         logger.info("extractContent resolved %d document reference(s) from %s", len(dl.references), source)
-=======
-        if not document_list_param:
-            return ActionResult.isFailure(error="documentList is required")
-
-        dl = coerceDocumentReferenceList(document_list_param)
-        if not dl.references:
-            return ActionResult.isFailure(
-                error=(
-                    f"documentList could not be parsed (type={type(document_list_param).__name__}); "
-                    "expected DocumentReferenceList, list of strings/dicts, or "
-                    "a wrapper dict like {'documents': [...]}"
-                ),
-            )
->>>>>>> 513ded84d529502d07a04d199df3f873f263cff0
 
         parent_operation_id = parameters.get("parentOperationId")
         self.services.chat.progressLogStart(