fix conflicted files - toolbar, scroller