merged local with server head, added daily stock with split demo