Forsyth County and the city of Cumming came together Friday morning to resolve some longstanding disputes. Both governments approved agreements on a new water contract and a split of the local option sales tax, both of which would have hit deadlines in a few days. The city council unanimously approved both agreements.