Fix lingering merge issue