fix bug issue in shoppinglist
fix merge