fixed merge commit error