fixed error message
merge