fixed merge conflicts and small addings