As a team, it's not a matter if conflict will arise, it's a matter of when. Conflict isn't necessarily bad, it all depends on how you handle the situation. A big way to deal with conflict is to communicate effectively. It's important that people are heard and you are not just hearing what you want to hear. Both parties need to be open to what the other has to say.
Within our group, we've had to deal with some conflict, and we've discussed what the best ways to deal with it are. It's good to decide together and not just have one person carry all the weight. We've learned that collaboration and communication are key to resolving conflict. We've learned that avoidance gets us no where. Overall, we have worked really well as a team and because of conflict we've been able to create better relationships and are more comfortable working on issues that arise.