add new file
Merge branch 'mybranch'
First merge
modify file
Merge branch 'mybranch'

Conflicts:
	README.md