continuing to resolve conflicts