Resolve

Conflict: Fight, battle, war; competitive or opposing action of incompatibles; antagonistic state or action as of divergent ideas, interests, or persons; mental struggle resulting from incompatible or opposing needs, drives, wishes, or external or internal demands; the opposition of persons or forces that gives rise to the dramatic action in a drama or fiction. From Latin conflictus act of striking together, from confligere to strike together.

Escalate: To increase in extent, volume, number, amount, intensity, or scope. From escalator.

Resolve: Break up, separate; to reduce by analysis; to deal with successfully, clear up; to find an answer to; to make clear or understandable; to reach a firm decision about; to declare or decide by a formal resolution and vote; to make (as voice parts) progress from dissonance to consonance; to become separated into component parts; From Latin resolvere to unloose, dissolve, release.