fix test to new semantics of conflict man