Conflicting change.
Another mainline edit
Merge branch 'conflict'

Conflicts:
	README.md
Add a newfile
left
wrong
Merge remote-tracking branch 'origin/conflict2'

Conflicts:
	newfile
better
Merge branch 'master' into conflict
Better