* Add buy and sell features
* Fix merge