fixed error
fixed merge conflict