resolve the merge problem

resolve the merge problem