Recommitting. Trying to get toolbar again.
resolved merge conflicts with ds store