diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua
index 392ad3a5..0d8d8da8 100644
--- a/lua/kickstart/plugins/lint.lua
+++ b/lua/kickstart/plugins/lint.lua
@@ -6,12 +6,8 @@ return {
     config = function()
       local lint = require 'lint'
       lint.linters_by_ft = {
-<<<<<<< HEAD
-        markdown = { 'markdownlint' },
-=======
         ['markdown'] = { 'markdownlint' },
         ['python'] = { 'flake8' },
->>>>>>> 373bf49 (typos)
       }
 
       -- To allow other plugins to add linters to require('lint').linters_by_ft,