fixed merge branches