Git says these are changed, but I didn't change them
Simplification of run() loop in Hasher
Merging conflicts