sidebar styled
sidebar styled, conflict resolved