commit before merge
merging ;    if XYZ2 is not None:
        return {'X':X, 'Y':Y, 'Z': Z}, {'X':X, 'Y': Y, 'Z':Z3}
    else:
        return {'X':X, 'Y':Y, 'Z': Z}