fixed merge conflict
fixed merge conflicts