feature 1 first update
commit feature 1 update and feature 2 new
Merge branch 'feature/feature_1' into develop

Conflicts:
	feature1.md
Merge branch 'hotfix/hotfix_1' into develop
Merge branch 'release/release_v1'