Resolve CHANGELOG merge conflict

Author: Joao-Dionisio

CHANGELOG.md

@@ -5,11 +5,8 @@
 - Added `addConsCumulative()` for SCIP cumulative constraints (#1222)
 ### Fixed
 ### Changed
-<<<<<<< ExprLike
-- Move magic methods (`__radd__`, `__sub__`, `__rsub__`, `__rmul__`, `__richcmp__`, `__neg__`, and `__rtruediv__`) to `ExprLike` base class
-=======
+- Move magic methods (`__radd__`, `__sub__`, `__rsub__`, `__rmul__`, `__richcmp__`, `__neg__`, and `__rtruediv__`) to `ExprLike` base class (#1204)
 - Speed up `Expr.__add__` and `Expr.__iadd__` via the C-level API
->>>>>>> master
 ### Removed
 
 ## 6.2.1 - 2026.05.16