Update toolbar
Merge