fixed small errors
fixed merge conflict