- bd import now detects git conflict markers and shows resolution steps - bd validate --checks=conflicts improved with clearer instructions - Updated AGENTS.md with better conflict resolution docs - Closes bd-7e7ddffa epic (repair tools complete) Amp-Thread-ID: https://ampcode.com/threads/T-4a11a65b-56c2-4d92-8f68-66f0a56ab5e3 Co-authored-by: Amp <amp@ampcode.com>