fix undefine
merge