one side of a conflict
other side of a conflict
Merge branch 'initialbranch'

Conflicts:
	src/source3
removed source2
change against branch with deletion
Merge branch 'otherbranch'

Conflicts:
	src/source2