diff --git a/crates/tui/src/tui/widgets/mod.rs b/crates/tui/src/tui/widgets/mod.rs
index 76e7abb0..4c3a2dbb 100644
--- a/crates/tui/src/tui/widgets/mod.rs
+++ b/crates/tui/src/tui/widgets/mod.rs
@@ -1,18 +1,15 @@
 mod footer;
 mod header;
-<<<<<<< HEAD
 // Some helpers (`shift`, `ctrl_alt`, `is_press`, etc.) are part of the
 // public surface for issue #93's help overlay and future call sites; allow
 // dead code rather than scattering `#[allow]` across every constructor.
 #[allow(dead_code)]
 pub mod key_hint;
-=======
 // Phase 1 of #85: widget lands without a wire-up site so reviewers can
 // evaluate the rendering in isolation. The follow-up PR plumbs it through
 // the composer area in `ui.rs`. `pub mod` (vs the usual `pub use` pattern)
 // keeps the unused-imports lint quiet until then.
 pub mod pending_input_preview;
->>>>>>> 8c605cc0 (feat(tui): pending-input preview widget (#85 Phase 1))
 mod renderable;
 
 pub use footer::{
diff --git a/crates/tui/src/tui/widgets/pending_input_preview.rs b/crates/tui/src/tui/widgets/pending_input_preview.rs
index ced56063..3e17fe7c 100644
--- a/crates/tui/src/tui/widgets/pending_input_preview.rs
+++ b/crates/tui/src/tui/widgets/pending_input_preview.rs
@@ -45,9 +45,7 @@ pub struct EditBinding {
 }
 
 impl EditBinding {
-    pub const ALT_UP: EditBinding = EditBinding {
-        label: "Alt+↑",
-    };
+    pub const ALT_UP: EditBinding = EditBinding { label: "Alt+↑" };
 }
 
 /// Widget showing pending steers + rejected steers + queued follow-up
@@ -125,10 +123,7 @@ impl PendingInputPreview {
             }
             push_section_header(
                 &mut lines,
-                Line::from(vec![
-                    Span::raw("• "),
-                    Span::raw("Queued follow-up inputs"),
-                ]),
+                Line::from(vec![Span::raw("• "), Span::raw("Queued follow-up inputs")]),
             );
             for message in &self.queued_messages {
                 push_truncated_item(&mut lines, message, width, dim_italic, "  ↳ ", "    ");
@@ -311,9 +306,7 @@ mod tests {
     #[test]
     fn pending_steer_shows_esc_hint_no_alt_up_hint() {
         let mut preview = PendingInputPreview::new();
-        preview
-            .pending_steers
-            .push("Please continue.".to_string());
+        preview.pending_steers.push("Please continue.".to_string());
         // Use a wide-enough column budget that the section header does not
         // wrap — keeps the assertions targeted at content rather than at
         // wrap boundaries.