Feature2

Merge the second feature.