Merge feature1 and feature2 into master in a single commit