Attempted to restore my previous edits to the sidebar because the merge failed