small errors
fixed merge conflicts