aaaaaaaaaaaaaaaaaaaaaaaaa
Merge branch 'master' of git@github.com:LDreptate/test.git
changed a.txt
Merge branch 'master' of git@github.com:LDreptate/test.git

Conflicts:
	b/a.txt