Resolving Conflicts

How can we resolve conflicts?