resolve Merge conflicts