Use falling action

The conflict had been raging for weeks, with no end in sight. But then, a solution was proposed that seemed to be the perfect way to resolve the issue. Everyone involved agreed to the plan, and the tension began to dissipate. As the days passed, the