Resurrect dead commits deletd by merge conflict with hersh