merge in tooltips from master