trying to resolve conflicts