Cleaned some left over bogus conflict markers.