resolve the merge conflicts