fix: error on join condition "unary and bool"

- Because Unary is also a bool expression, we had
wrong conflict resolution for join (without single),
that didn't take into account that bool expression
may have Unary as one of the children.
- I also noticed a small bug for single distribution
in join, fixed it.