the header show only tabs requires if your are connected or not
add about for a merge conflict
Merge branch 'master' of https://github.com/theragebox/paint_something