Conflicts:
	.vimrc