merge feature branch