Collaborative problem solving in conflict