returns hashIndex now
fixing conflicts