Remove lingering merge fails.