@hansl can I simply click on the Resolve conflicts to fix the conflict or that isn't allowed?

You can try, but we've never had any success with that button :) . The new errors are because you have Revert commits which don't follow our naming conventions. I'll squash your PR, but in the future we normally just accept a single commit for PR and it would need to be squashed.

Thanks!

@hansl Thanks very much!

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

_{This action has been performed automatically by a bot.}