resolve merge conflicts, sidebars scrollable