Test commit feature2
merge feature2 into feature1, resolved conflict