Conflict occurs when one person has a need of another and that need is not being met. The most common way to deal with conflict is to avoid and walk way from it. Too many people will smooth things over but the conflict can continue and build and grow for several hours, weeks, months and even years.Doing this, however, can result in emotional stress and the situation can escalate.
When conflict occurs you need to first express the need and then try to either resolve this or manage this need. If the need is met, it results in conflict resolution; if it is unmet, you need to agree a way in which it is managed.
Here are some self-help workbooks that you can use to deal with:
Facing your feelings