[MERGE] conflict in ToolBarViewModel fixed