rebased origin master and fixed merge conflicts