add some merge tools
disable nvm for now - not using it