fix bug commint
merge fix bug branch code
commit merge bug branch and master feature