(#5) - fix _conflict assertion in tests