Consolidate handling of conflicts between the batch job and get_conflicts api