Fix :: After applying cherry pick there might be some conflict with the same line changes.

So we need to add extra confrimation for it.