a-1
a-2
a-3
Merge branch 'feature/a' into develop
Merge branch 'develop' into feature/b

Conflicts:
	test.txt