fix weird merge markup