ways of resolving social conflict