fixed merge conflicts (2)