asdfasdf
asdfasfsafasdf
Merge branch 'branch1'

Conflicts:
	newfile
master