Please can someone help me how to resolve conflict. I am not really understanding what is wrong.
Which conflict? I don't see any conflict here. I only see code style errors reported by drone. If you follow the details you end at the log file here: https://ci.joomla.org/joomla/joomla-cms/40993/1/6 .
It mainly says you have to use tabs to indent code.
And which PR is right now? This one or #32786 ? They use different branches but are identical regarding changes. Please close one of these two. There is a button for closing it at the bottom of the PR.
Please can someone help me how to resolve conflict. I am not really understanding what is wrong.