3. Add this line to feature B
Merge branch 'featureB' into featureA

Conflicts:
	actions.txt