merge conflicts > remove hash definition, it does not make sense