i have terrible code
Fixed merge errors.
updated customerdetailsform