One good commit with feature
Merge remote-tracking branch 'origin/super_feature' into super_feature