made a change
three line
	modified:   vimrc
Merge branch 'test'

Conflicts:
	vimrc