conflict.vim

augroup ConflictMarkerDetect
    autocmd!
    autocmd BufReadPost * call HighlightConflicts()
augroup END
function! HighlightConflicts() abort
  syntax region conflictHead
        \ containedin=ALL
        \ start=/^<<<<<<< \@=/
        \ end=/^=\@=/
  syntax region conflictMerge
        \ containedin=ALL
        \ start=/^=======\zs$/
        \ end=/^>>>>>>>\s\w*/
  hi conflictHead guifg=#ffffff guibg=#99c794
  hi conflictMerge guifg=#ffffff guibg=#62b3b2
endfunction