Fixed return bug
Fixed return bug and merge file