fix parallel conflict names