creating and resolving conflicts