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

Conflicts:
	test.txt
Merge branch 'feature/b' into develop