fixed merge command