Merge feature branch