Enable ConflictResolution on partition merge with PreferConsistencyStrategy

Currently conflict resolution only occurs on a partition merge when the PreferAvailabilityStrategy is utilised (ALLOW_READ_WRITES). This should also occur when utilising the PreferConsistencyStrategy as it's possible for cache entries to become conflicted before a split-brain has been detected.