Conflict resolution in local-remote sync

Handle cases where local user actions conflict with incoming server state.