changed .vimrc
added diffconflict.sh for git merge conflicts resolution