Add diffconflicts and alignments settings in .vimrc