version sync conflict resolution