reformat code for comapnyPricing
Removed conflict