master change
branch change
Merge branch 'mybranch'

Conflicts:
	newfile