diff --git a/autogpt_platform/backend/Dockerfile b/autogpt_platform/backend/Dockerfile
index 4816bbeece..05a8d4858b 100644
--- a/autogpt_platform/backend/Dockerfile
+++ b/autogpt_platform/backend/Dockerfile
@@ -66,16 +66,11 @@ ENV POETRY_HOME=/opt/poetry \
     DEBIAN_FRONTEND=noninteractive
 ENV PATH=/opt/poetry/bin:$PATH
 
-<<<<<<< HEAD
 # Install Python, FFmpeg, ImageMagick, and CLI tools for agent use.
 # bubblewrap provides OS-level sandbox (whitelist-only FS + no network)
 # for the bash_exec MCP tool.
-RUN apt-get update && apt-get install -y \
-=======
-# Install Python, FFmpeg, and ImageMagick (required for video processing blocks)
 # Using --no-install-recommends saves ~650MB by skipping unnecessary deps like llvm, mesa, etc.
 RUN apt-get update && apt-get install -y --no-install-recommends \
->>>>>>> 43b25b5e2fdec3fa0579f952d835355cddbd00f8
     python3.13 \
     python3-pip \
     ffmpeg \
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/models.py b/autogpt_platform/backend/backend/api/features/chat/tools/models.py
index 5cf86d5ab0..aa672d3a3d 100644
--- a/autogpt_platform/backend/backend/api/features/chat/tools/models.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/models.py
@@ -341,7 +341,6 @@ class BlockInfoSummary(BaseModel):
     id: str
     name: str
     description: str
-<<<<<<< HEAD
     categories: list[str]
     input_schema: dict[str, Any] = Field(
         default_factory=dict,
@@ -355,8 +354,6 @@ class BlockInfoSummary(BaseModel):
         default_factory=list,
         description="List of input fields for this block",
     )
-=======
->>>>>>> 43b25b5e2fdec3fa0579f952d835355cddbd00f8
 
 
 class BlockListResponse(ToolResponseBase):
@@ -366,12 +363,10 @@ class BlockListResponse(ToolResponseBase):
     blocks: list[BlockInfoSummary]
     count: int
     query: str
-<<<<<<< HEAD
     usage_hint: str = Field(
         default="To execute a block, call run_block with block_id set to the block's "
         "'id' field and input_data containing the fields listed in required_inputs."
     )
-=======
 
 
 class BlockDetails(BaseModel):
@@ -391,7 +386,6 @@ class BlockDetailsResponse(ToolResponseBase):
     type: ResponseType = ResponseType.BLOCK_DETAILS
     block: BlockDetails
     user_authenticated: bool = False
->>>>>>> 43b25b5e2fdec3fa0579f952d835355cddbd00f8
 
 
 class BlockOutputResponse(ToolResponseBase):
diff --git a/autogpt_platform/frontend/src/app/api/openapi.json b/autogpt_platform/frontend/src/app/api/openapi.json
index 49d78ccadb..08e2fb342c 100644
--- a/autogpt_platform/frontend/src/app/api/openapi.json
+++ b/autogpt_platform/frontend/src/app/api/openapi.json
@@ -7066,7 +7066,6 @@
         "properties": {
           "id": { "type": "string", "title": "Id" },
           "name": { "type": "string", "title": "Name" },
-<<<<<<< HEAD
           "description": { "type": "string", "title": "Description" },
           "categories": {
             "items": { "type": "string" },
@@ -7094,15 +7093,30 @@
         },
         "type": "object",
         "required": ["id", "name", "description", "categories"],
-=======
-          "description": { "type": "string", "title": "Description" }
-        },
-        "type": "object",
-        "required": ["id", "name", "description"],
->>>>>>> 43b25b5e2fdec3fa0579f952d835355cddbd00f8
         "title": "BlockInfoSummary",
         "description": "Summary of a block for search results."
       },
+      "BlockInputFieldInfo": {
+        "properties": {
+          "name": { "type": "string", "title": "Name" },
+          "type": { "type": "string", "title": "Type" },
+          "description": {
+            "type": "string",
+            "title": "Description",
+            "default": ""
+          },
+          "required": {
+            "type": "boolean",
+            "title": "Required",
+            "default": false
+          },
+          "default": { "anyOf": [{}, { "type": "null" }], "title": "Default" }
+        },
+        "type": "object",
+        "required": ["name", "type"],
+        "title": "BlockInputFieldInfo",
+        "description": "Information about a block input field."
+      },
       "BlockListResponse": {
         "properties": {
           "type": {
@@ -7120,16 +7134,12 @@
             "title": "Blocks"
           },
           "count": { "type": "integer", "title": "Count" },
-<<<<<<< HEAD
           "query": { "type": "string", "title": "Query" },
           "usage_hint": {
             "type": "string",
             "title": "Usage Hint",
             "default": "To execute a block, call run_block with block_id set to the block's 'id' field and input_data containing the fields listed in required_inputs."
           }
-=======
-          "query": { "type": "string", "title": "Query" }
->>>>>>> 43b25b5e2fdec3fa0579f952d835355cddbd00f8
         },
         "type": "object",
         "required": ["message", "blocks", "count", "query"],