master change
Merge branch 'mybranch'

Conflicts:
	newfile
Merge branch 'mybranch'
add file2
Merge branch 'mybranch'