Which is a form of conflict resolution. It requires the application to be aware of the datastore.
I wonder if, since BDR is just a plugin now, a plugin that used strong consistency guarantees could be built using the same changes that were required for BDR.
TL;DR: It is not in mainline, but it does not need a patch anymore. You need to bring your own conflict resolution logic.