fix the merge conflicts of hotfix branch