Sheriff's and City of Socorro come to agreement over public funds