Created work1 on master!
This is a change on mybranch!
This is a change on master!
Merge branch 'mybranch'

Conflicts:
	work1.txt