fixed merge conflicts