Remove forgoten conflict lines