change feature 3
fix feature 3
Merge branch 'feature/feature3' into develop