new sidebar
fixing conflicts