siderbar complete
conflict