use vim-marching, conflict-marker.vim
add some aliases and functions (thanks iyuya)