1. resolve conflicts.