conflict resolved, update to refactored version

of sidebar entries and related events