fix conflicting hash