2. Add this line to feature A
3. Add this line to feature B
4. Add this file to feature A
Merge branch 'featureB' into featureA

Conflicts:
	actions.txt