chore: Update CHANGELOG.md

Co-authored-by: Maria Ines Parnisari <maria.ines.parnisari@authzed.com>

Author: tstirrat15

CHANGELOG.md

@@ -9,13 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added support for YAML-based validation files in the Language Server (https://github.com/authzed/spicedb/pull/3024)
 - Enable statistics-based optimizations when `--experimental-query-plan` is enabled. (https://github.com/authzed/spicedb/pull/3052)
 - Added missing implementations of cursoring for LookupResource, LookupSubjects and ReadRelationships calls in FDW (https://github.com/authzed/spicedb/pull/3016)
-  <<<<<<< conflict 1 of 1
-  %%%%%%% diff from: lkrwnprm 4bf32be0 "chore: fix validation errors" (parents of rebased revision)
-  \\\\\\\        to: lkrwnprm 4bf32be0 "chore: fix validation errors" (rebased revision)
-  +- Add new gRPC Dispatch API and messages for dispatching query plans (https://github.com/authzed/spicedb/pull/3072)
-  +++++++ qlonukrn 8f50a918 "chore: update changelog" (rebased revision)
-- Added debug behavior to LookupResources that can help identify data cyles in LR calls (https://github.com/authzed/spicedb/pull/3070)
-  >>>>>>> conflict 1 of 1 ends
+- Add new gRPC Dispatch API and messages for dispatching query plans (https://github.com/authzed/spicedb/pull/3072)
+- Support new `withDebug` flag in LookupResources calls to identify cycles (https://github.com/authzed/spicedb/pull/3070)
 
 ### Changed
 - Removed MySQL metrics prefixed with `go_sql_stats_connections_*` in favor of those prefixed with `go_sql_*` (https://github.com/authzed/spicedb/pull/2980)