forgot to bump merge hash