Tidy conflict removals.