Merge remote 'yield' work