C4
Merge branch 'feature2'

Conflicts:
	file1