fix errors
merge conflict