commit 1.txt
commit 2.txt in feature_2
commit 2.txt in feature_1
Merge branch 'feature_1' into develop
Merge branch 'feature_2' into develop

Conflicts:
	2.txt