Fix bitlydata conflict