fix resolve duplicates 2