first edit by feature1
feature1 second
feature 2 first
feature1 third
Merge branch 'master' into feature2

Conflicts:
	README.txt
Merge branch 'master' into feature1

Conflicts:
	README.txt
Merge branch 'feature2'

Conflicts:
	README.txt