resolve conflicts.