after/ftplugin/cmake.vim

@@ -6,9 +6,6 @@ setlocal foldmethod=syntax
 " Set comment string
 setlocal commentstring=#%s
 
-" setlocal indentkeys=0{,0},:,0#,!^F,o,O,e,=ENDIF(,ENDFOREACH(,ENDMACRO(,ELSE(,ELSEIF(,ENDWHILE(
-setlocal indentkeys=:,!^F,o,O,e,=endif(,=ENDIF(,endforeach(,ENDFOREACH(,endmacro(,ENDMACRO(,else(,ELSE(,elseif(,ELSEIF(,endwhile(,ENDWHILE(
-
 " Custon surround for creating a CMake variable from a text object.
 " "ys{motion}v" makes a variable out of "text-obj" -> "${text-obj}"
 let b:surround_{char2nr("v")} = "${\r}"

plugin/autocmds.vim

@@ -6,7 +6,7 @@ augroup benieAugroup
           \ | exe "normal! g'\"" | endif
 
   " Highlight conflict markers in any filetype
-  au FileType * call matchadd('Todo', '^\(<<<<<<<\s.*\||||||||\|=======\|>>>>>>>\s.*\)$')
+  au FileType * call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\s\ze.*$')
 
   " Update `Last change: <date>` on write & go back previous cursor position
   au FileType help au BufWritePre <buffer>