Fix merge conflicts on cherry pick