Title: FROM CONFLICT MANAGEMENT TO CONFLICT RESOLUTION