commit for branch 1st
Merge remote-tracking branch 'origin/branch1'

Conflicts:
	mytest.txt