Brute force merge corruption correction

That was silly.