rollback merge fix_multiple_hasone