Resolving conflicts with a focus on solutions