pick commit and merge