Fairfax County’s water wars could end with a merger between the two parties most embroiled in conflict, as Fairfax Water this week offered to work out a mutually agreeable merger with Falls Church’s system, according to The Washington Post.

The overture comes weeks after Falls Church publicly announced its interest in exploring all options, including a sale or merger, of the water utility it has operated since the 1930s.