sidebar for main finally works
doing some merge stuff