fix bug of merge pull request