Merge Conflict Resolution (from 10.2.x to 11.0.x)

[subhashiyer9]

Problem

Solution

Does this solution apply anywhere else?

• [ ] yes
• [ ] no

If yes, where?

Test Strategy

Testing done:

• [ ] Unit tests
• [ ] Integration tests
• [ ] System tests
• [ ] Manual tests

Release Plan

[cla-assistant[bot]]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

:white_check_mark: subhashiyer9
:x: ConfluentJenkins
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[cla-assistant[bot]]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

:white_check_mark: subhashiyer9
:x: ConfluentJenkins
_{You have signed the CLA already but the status is still pending? Let us recheck it.}