Here are some ways to resolve conflict