change on feature2
Merge branch 'feature2'

Conflicts:
	develop1.txt