Step 25
Resolve Conflict