Updated conflict W command in vimrc