branch commit
committing from master
Merge branch 'myBranch'

Conflicts:
	MYFILE.txt