Technical contributor onboarding/Resolve merge conflict

We will try to resolve conflict for patch 591060.

You can see that a patch has merge conflict in two places.