Fix lingering merge issues.