return to 
Handling Merge Conflicts
Sometimes a received certificate has a conflicting address. A merge conflict will appear when you accept it.
You can merge that address into an existing client. Click the merge conflict, so it highlights grey, then select the Client list you wish to merge the address into.
Next, you can see the merge conflict has been resolved by the selected company. Click ‘Finish’ to push these conflicts through.
