Feature2
Feature3
Merge conflict solved