Management of conflict