removed rename branch
toggle sidebar functionality
pull from repo
merge confict