left
Merge remote-tracking branch 'origin/conflict2'

Conflicts:
	newfile