changed to use vim as diff and merge tool