diff --git a/.config/nvim/lua/plugins/symbol-usage.lua b/.config/nvim/lua/plugins/symbol-usage.lua
index 18ea634..5a34284 100644
--- a/.config/nvim/lua/plugins/symbol-usage.lua
+++ b/.config/nvim/lua/plugins/symbol-usage.lua
@@ -29,11 +29,7 @@ return {
 
     require("symbol-usage").setup({
       text_format = text_format,
-<<<<<<< HEAD
       vt_position = "end_of_line",
-||||||| 6714ddc
-=======
->>>>>>> f01c70951e053d56cbfed781149becf3f9299a3f
     })
   end,
 }