merge a branch