Revert "Merged basket feature, resolve conflict"

This reverts commit cc1ee9893ac28ff1e7e8441fd989da6867cef687, reversing
changes made to 0eb0c661fae055b8fb6e97806e2dc1052ba7518a.
Updated version to 1.5.0