modify the bug of code merge