Once you have a single main history of checkpoints and want to resolve conflicts, you're likely already dealing with all the hard parts of getting high throughput
At 00:00:00 utc you take a snapshot of the code deployed to all your machines (if different code was deployed in different machines then it is part of this capture).
That is the unambiguous code state of your production system.
There is no conflict in a prod state by definition. If there was it cannot be prod.