Fix consequences of a bad merge