fixed merge conflicts (I)