git merge feature1 feature2
