Update the tutorial for the conflict situations