Step-by-Step Conflict Resolution

Click Conflict_Resolution.pdf link to view the file.