City and firefighters hit snag again while police are near new deal