1st commit in branch a
the commit from master after branching a
Merge branch 'a'

Conflicts:
	code.txt