Fixing merge conflict and tweaking a few things
Fixing merge conflict and tweaking a few things

cswef/tooltipster_cn,MIKUScallion/tooltipster_cn,MIKUScallion/tooltipster_cn,andersonunsonst/tooltipster,trusktr/tooltipster,iamceege/tooltipster,trusktr/tooltipster,iamceege/tooltipster,andersonunsonst/tooltipster,cswef/tooltipster_cn