customer addition
conflict resolve