修正merge时的错误
Signed-off-by: xavieryao <xavieryao@live.cn>