test deal with the conflict again