Fix an unsuccessful merge