This is a commit from vim
Test
change in mybranch
Master commit
Merge branch 'mybranch'

Conflicts:
	README.md