back to using vim as merge tool, sym oh-my-zsh so i dont refer to myself