After a few skirmishes and much negotiation, a peace agreement was reached.
After a number of battles and heated talks, peace was restored.
The agreement came into place after many skirmishes and little negotiation.