Merge coflict vimrc