diff --git a/config/config.yaml b/config/config.yaml
index 711110f97..5025a4977 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -121,7 +121,6 @@ TIMEOUT: 60 # Timeout for llm invocation
 
 # PROMPT_FORMAT: json #json or markdown
 
-<<<<<<< HEAD
 ### Agent configurations
 # RAISE_NOT_CONFIG_ERROR: true  # "true" if the LLM key is not configured, throw a NotConfiguredException, else "false".
 # WORKSPACE_PATH_WITH_UID: false  # "true" if using `{workspace}/{uid}` as the workspace path; "false" use `{workspace}`.