Fixed merge in py_main