1 step feature branch
2 step faeture
3 step feature
Merge branch 'feature' into develop