changed some lines in the vimrc
fix merge conflicts
change font size to 14