Safe

Mix merge conflict for my better side bar