fix error merge pull request