More merge garbage left over.