xyz
Merge branch 'foobranch'

Conflicts:
	abc

Keep both