Merge conflict resolution, Steve|Carol