Resolve the merge conflicts