Etymology
Today it means: To eliminate or resolve a conflict in something. Full definition →
From un- + conflict.
Etymology from Wiktionary, CC BY-SA 4.0.