fixed merge conflicts2