conflict resolution

Shopping cart