C1
C4
C5
C6
Merge branch 'feature2'

Conflicts:
	file1