fix accidental committed conflict
fix accidental committed conflict

aiwenlg007/toolbar,NickChen14/toolbar,cranca/toolbar,iannerubia/toolbar,paulkinzett/toolbar,Jeremy017/toolbar,royyu2898/toolbar,webmechanicx/toolbar