added discard button on the shoppinglist
fixed conflicts