Embarassing merge blunder...