add gitgutter for vim
fix merge conflict