Feature/handle sfdc duplicates