fixed merge conflicts properly