Fixed merge conflict as well as added historical prices, logout and debugging