City comes out on top in water tank standoff