fixed merge conflicts here and there