an update in master
Merge
This is an update from fugitive
This is a commit from vim
Test
change in mybranch
Master commit
Merge branch 'mybranch'

Conflicts:
	README.md
Update in Master
Update in myBranch
"this is a test"
This is a test
Cleaned up file
Merge branch 'mybranch'

Conflicts:
	README.md
updated
Merge
Updated
Merge branch 'mybranch'

Conflicts:
	README.md