drini.vim merge conflict leftover fix