fix converting error from new-branch