Add new feature
Add bug fix
Merge branch 'new_feature' into bug_fix
Add correction1
Add correction2
Merge new_feature branch
Add new great feature
Revert "Add new great feature"

This reverts commit ee4ae032c1deae367403424687dfd2839ec5f56f.