dealing with conflicts