fix incorrect merging of conditional with link