fixed tabs color thing
resolved conflict