fixed errors
fixed merge conflict