Add Colorcolumn in .vimrc.
merge conflict