Of course, who hasn't had issues with the people that they work with? You resolve it by understanding that you're both people, both have opinions that want to be heard, and as long as you and the other person feel like you are heard, it's a lot easier to deconstruct the conflict and to de-escalate everything. That's how I take care of things. I make sure the other people feel heard, I make sure that I offer a solution that benefits both people, and I de-escalate.