Fixed bug in basket
Resolved conflicts