Resolve conflicts.