[QuercusMax]

If you have conflicts then you can fix them and run your linter or formatter. If you have a no conflict merge it doesn't matter.

[mcv]

Thanks, but that's not the issue here.