First commit to conflict
Merge branch 'conflict'

Conflicts:
	change-me

Merged with conflict