fix resolve duplicates