Cops, city agree on new contract