in my branch

commit in my branch
Merge branch 'myBranch'

Conflicts:
	test.rtf