- add some little things to the vimrc
resolved conflicts in vimrc