vim
 solve conflict