Add toolbar
merge conflicts