City water line fixed; but residents asked to conserve