fix: resolve CHANGELOG merge-conflict markers committed in b8525c8

Remove literal <<<<<<<, =======, >>>>>>> markers and consolidate the
two adjacent ### Fixes sections produced by the 1.12.latest merge so
the 1.12.0 release section reads as one Fixes block.

Author: sd-db

CHANGELOG.md

@@ -12,14 +12,8 @@
 
 - Fix `RefreshConfig.__eq__` self/other typo where two configs with the same `cron` but different `time_zone_value` compared equal
 - Fix streaming-table DROP-SCHEDULE path that was silently filtered out of the changeset
-
-### Fixes
-
-<<<<<<< sd-db/fix/issue-1331-warehouse-only-parse-stub
-- Fix capability-branching macros falling through to their legacy path at parse/compile time on SQL warehouses. The parse-time stub of `has_dbr_capability` now returns `True` on warehouse profiles for capabilities flagged `sql_warehouse_supported`, so macros select the modern branch during compilation instead of the legacy fallback. ([#1331](https://github.com/databricks/dbt-databricks/issues/1331))
-=======
 - Fix `metric_view` failing with `METRIC_VIEW_INVALID_VIEW_DEFINITION` when models use bare `{{ ref(...) }}` for the `source:` field ([#1361](https://github.com/databricks/dbt-databricks/issues/1361))
->>>>>>> 1.12.latest
+- Fix capability-branching macros falling through to their legacy path at parse/compile time on SQL warehouses. The parse-time stub of `has_dbr_capability` now returns `True` on warehouse profiles for capabilities flagged `sql_warehouse_supported`, so macros select the modern branch during compilation instead of the legacy fallback. ([#1331](https://github.com/databricks/dbt-databricks/issues/1331))
 
 ### Under the Hood