fixed merge conflicts (II)