fixed merge conflicts and other small issues