through vimdiff handle conflict merge