added 1 line in feature 1
some commit
Merge branch 'feature/feature1' into develop

Conflicts:
	new.txt
Merge branch 'develop'