Tab name change and link to info tab
Resolve conflict