updates tabs.js
conflict resolved