updations
customer printcustomer
conflict resolved in customers