store vimrc from work
fix merge conflict