Merge feature branches