fix wrongly merged parts