anotate ui phase 1

.aider.conf.yml

@@ -1,24 +1,6 @@
 # Aider configuration file
 # For more information, see: https://aider.chat/docs/config/aider_conf.html
 
-<<<<<<< HEAD
-# To use the custom OpenAI-compatible endpoint from hyperbolic.xyz
-# Set the model and the API base URL.
-# model: Qwen/Qwen3-Coder-480B-A35B-Instruct
-model: lm_studio/gpt-oss-120b
-openai-api-base: http://127.0.0.1:1234/v1
-openai-api-key: "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"
-model-metadata-file: .aider.model.metadata.json
-
-# The API key is now set directly in this file.
-# Please replace "your-api-key-from-the-curl-command" with the actual bearer token.
-#
-# Alternatively, for better security, you can remove the openai-api-key line
-# from this file and set it as an environment variable. To do so on Windows,
-# run the following command in PowerShell and then RESTART YOUR SHELL:
-#
-# setx OPENAI_API_KEY "your-api-key-from-the-curl-command"
-=======
 # Configure for Hyperbolic API (OpenAI-compatible endpoint)
 # hyperbolic
 model: openai/Qwen/Qwen3-Coder-480B-A35B-Instruct
@@ -41,4 +23,3 @@ gitignore: false
 # The metadata file is still needed to inform aider about the
 # context window and costs for this custom model.
 model-metadata-file: .aider.model.metadata.json
->>>>>>> d49a473ed6f4aef55bfdd47d6370e53582be6b7b