added shoping list
merge