Make mergeBasket
Conditional More Robust
#1048
Merged
mergeBasket
Conditional More Robust
#1048