better
Merge branch 'master' into conflict
Better
The same.
Merge branch 'conflict'

Conflicts:
	newfile

This merge was performed by the `git-auto merge' command using
git-rerere(1) conflict resolution information.