City agrees to $600k settlement