Conflict right.
Finished feature 52375299/test-storyyy-42.

Conflicts:
	b.foo