Styling of tabs.
Resolving merge conflict