really fix incorrect merging of conditional with link, without breaking optimization of conditional link