They sometimes refer to the same thing, but "resolution" is almost always used in the case of a conflict. There's usually some kind of stress, even if it's only a dissonant chord in the orchestra which begs to be resolved. We often speak of "resolving our differences," or our disagreements.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.