Resolving merge conflicts according to partition validator changes