Remove remnants from conflict resolution (#3528)

Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A

crates/workspace2/src/workspace2.rs

@@ -68,7 +68,6 @@ use std::{
 use theme::{ActiveTheme, ThemeSettings};
 pub use toolbar::{Toolbar, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView};
 pub use ui;
-// use ui::{h_stack, v_stack, StyledExt};
 use util::ResultExt;
 use uuid::Uuid;
 pub use workspace_settings::{AutosaveSetting, WorkspaceSettings};