branch 1st commit
branch 2nd commit
Merge commit '840f85e99be963183489b0c647f711d1f6b4cb9d'

Conflicts:
	a
	x.txt