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

Conflicts:
	test.txt