adds sidebar + hard coded comment
fix conflicts