edit thirdfile
Merge branch 'feature1'

Conflicts:
	thirdfile