fixed merge conflicts with branch change