Resolve merge conflict tabzilla.js