Huh. What? That merge should not have failed like that...