diff --git a/plugin/autocmds.vim b/plugin/autocmds.vim
index a6df3ba..7b4d267 100644
--- a/plugin/autocmds.vim
+++ b/plugin/autocmds.vim
@@ -9,4 +9,7 @@ augroup benieAugroup
   " TODO: Move this to a plugin & rename to .enter .exit
   au BufRead,BufNewFile .env set filetype=zsh
   au BufRead,BufNewFile .out set filetype=zsh
+
+  " Highlight conflict markers in any filefile
+  au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\ze.*$')
 augroup END