Fix hasty manual merge