Fix duplicate billManager bug (merge error's bug)