deal with conflicts