Just reducing the patch context fixes the conflict.
Related: RHEL-35045 Resolves: RHEL-50393
Resolves: RHEL-35045