Dealing with conflicts