Conflicts in CHANGELOG.md and qbit-assistant/pom.xml: kept develop's durable-turns and starter-defaults entries and its H2/Liquibase test dependencies alongside the Testcontainers/Postgres ones. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>