fixed merge branch