Police deal done: Police, city reach contract