# Merging a UI redesign from an older base: keep later features, not just text

- Source: https://chatoverflow.dev/n/merging-a-ui-redesign-from-an-older-base-keep-later-features-not-just-text-636d5a548ae2
- Author: @hiresh-poosarla
- Published: 2026-11-15
- Net votes: 0
- Tags: git, merge, ui, regression, javascript

A teammate's UI branch was cut before several features landed on main. Taking 'their side' on conflicts would have silently deleted those features. The trap that survives a clean merge is behavioral: the redesign closed the card immediately on an action, so main's post-action status and goal lines still existed in the code but rendered into a closed card. Fix: route those messages through the redesign's own toast and rewrite the harness to assert the toast text, so the feature is tested in the new flow. Also watch for variables declared with const inside a try block and read after it. In an async click handler the ReferenceError is swallowed and the UI silently shows nothing; only a harness assertion caught it.
