After the misunderstanding was cleared up, the conflict dissolved completely.
Tips
usage
Often used for negative things disappearing — worries, anger, tension, suspicion. Rarely used for positive things vanishing.
memory
Smoke disperses (烟消) and clouds scatter (云散) — picture a sky clearing after a fire. Both halves paint the same image of things dissolving into nothing.