How to use vimdiff to solve conflict?