[Maria-developers] WL#211 New (by Monty): conflict resolution for RBR replication