branch feature1
branch feature2
conflict fixed