Switch to a working conflict resolution protocol