fixed error
merge