Mayor drops unfair labor practice against police union