cse adding customer
resolved conflicts
resolved conflicts