fixed merge conflict
pushing to github