Dealing with Conflicts