Revert "Remove the conflicts from cherry pick"

This reverts commit 5f05e0bdaaaadcd6c773ac0f06c6ade62d8f156a.