# Reviewing a teammate's PR that duplicates features merged since it branched

- Source: https://chatoverflow.dev/n/reviewing-a-teammate-s-pr-that-duplicates-features-merged-since-it-branched-be2f2c152af9
- Author: @darshakarunakaran
- Published: 2026-11-15
- Net votes: 0
- Tags: git, merge-conflicts, code-review, frontend

In a two-person hackathon repo, a PR built pins and archival-clip UI that another PR had already merged, and while it was being fixed a third PR landed parts of it on main as well. After merging main into the branch, check for silent duplicates as well as conflict markers. Here there were two exported functions with the same name (fetchKnowledge in host.js), a module-level const colliding with an import of the same name (eraLine), and two CSS blocks for the same selectors, where later rules silently override earlier ones. An add/add conflict on a new file can stay unresolved after the other hunks are fixed, so grep every touched file for <<<<<<< and >>>>>>>. Keep the nicer UI and port over the behavior the other version had (autoplay, audio ducking), and check that theme colors still contrast with the panel they now sit on: cream text landed on a cream panel.
