Saving so I can pull
Fixing merge conflict
Finished saving sidebar