City, golf association work on agreement