1.5_AddToCart_#255_resolving_conflicts