change 3
Merge branch 'feature1' into develop
Merge branch 'develop'

Conflicts:
	README.md