Conflict avoidance is where you take steps to remain clear of disputes!
Conflict confrontation is when you want to stop any disagreements and get them out in the open and shut it down before anything bad happens.
Conflict resolution is when and where a conflict is settled. It is no longer any form of conflict.