fixed errors
merge conflicts