bi for customer
merge conflicts