bar colors
merge conflict resolved
removed sessions text