resolve merge conflict

[SumantxD]

this pr fixes the issue with #1455

[Dev-Khant]

@SumantxD Tests are failing can you please check and fix it.

[CLAassistant]

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.
0 out of 2 committers have signed the CLA.

:x: sumant tirkey
:x: SumantxD

---

sumant tirkey seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[Dev-Khant]

@SumantxD Please use #1468 to resolve the conflicts, closing this PR.