fix Notice:  Undefined variable
Merge remote branch 'remotes/origin/patch-1'