fix customer
merge2