Re applied Changes to sidebar that is lost from merging