Auto-merging crates/spt-daemon/src/brain.rs Auto-merging crates/spt-daemon/src/broker.rs Auto-merging crates/spt/src/cli.rs Auto-merging traceable-reqs.toml CONFLICT (content): Merge conflict in traceable-reqs.toml Automatic merge failed; fix conflicts and then commit the result.