Correct hack sidebar style
Resolve merge conflicts