refactored favorite customer
fixing merge conflicts