You have several options for resolving conflicts:
Resolve conflicts as they occur using temporary or permanent tables and a resolve_conflict script.
Resolve conflicts as they occur using an upload_update script.
Resolve all conflicts at once using a table's end_upload script.
Resolving conflicts with resolve_conflict scripts
Resolving conflicts with upload_update scripts