fix recently introduced bug in mergeOptions where list and dict canot be added together
fix recently introduced bug in mergeOptions where list and dict canot be added together

xpybuild/xpybuild,xpybuild/xpybuild,xpybuild/xpybuild,xpybuild/xpybuild