support proper merging of nested conditionals