Figure 10.14    Resolve Conflicts