fixup merge (missing a <<<)