diff --git a/lua/custom/plugins/chatgpt.lua b/lua/custom/plugins/chatgpt.lua
index 7fb58810..35b4dd16 100644
--- a/lua/custom/plugins/chatgpt.lua
+++ b/lua/custom/plugins/chatgpt.lua
@@ -6,12 +6,9 @@ return {
       require("chatgpt").setup(
         {
           api_key_cmd = "pass show azure/hypera/oai/token",
-<<<<<<< HEAD
-=======
           api_host_cmd = "pass show azure/hypera/oai/url",
           predefined_chat_gpt_prompts =
           "https://raw.githubusercontent.com/julianobarbosa/custom-gpt-prompts/main/prompt.csv"
->>>>>>> 6e7efe1fd708281c9c1e215c554461ac76236ee5
         }
       )
     end,