bbb
aaa

Conflicts:
	a.txt
Merge branch 'master' into develop