update from Tuan to allow merging cart
bump version