One good commit with feature
Merge branch 'super_feature'