added dashboard on the left
conflict resolve