steps to resolve conflicts