Feature One
Feature two
Merge branch 'master' into feature

Conflicts:
	atext.txt