sync and conflict resolution