Conflict Resolution Steps, Here’s how to resolve conflicts: Step 1: Identify the conflict files.