resolve the merge conflict

resolved the merge conflict