some file added
another file
Merge branch 'feature/feature-number-one' into develop
final file
Merge branch 'release/release-1.0.0'