fix errors
merge
error