Remove conflict markers from changelog (#12349)

* Remove conflict markers from changelog

* Update contributors.yml

CHANGELOG.md

@@ -661,9 +661,7 @@ async function fakeGetSlugsFromCms() {
 - [`@react-router/remix-config-routes-adapter`](https://github.com/remix-run/react-router/blob/react-router%407.0.0/packages/react-router-remix-config-routes-adapter/CHANGELOG.md#700)
 - [`@react-router/serve`](https://github.com/remix-run/react-router/blob/react-router%407.0.0/packages/react-router-serve/CHANGELOG.md#700)
 
-# **Full Changelog**: [`v6.28.0...v7.0.0`](https://github.com/remix-run/react-router/compare/[email protected]@7.0.0)
-
-> > > > > > > release-next
+**Full Changelog**: [`v6.28.0...v7.0.0`](https://github.com/remix-run/react-router/compare/[email protected]@7.0.0)
 
 ## v6.28.0
 
@@ -685,12 +683,6 @@ Date: 2024-11-06
 
 **Full Changelog**: [`v6.27.0...v6.28.0`](https://github.com/remix-run/react-router/compare/[email protected]@6.28.0)
 
-# <<<<<<< HEAD
-
-> > > > > > > dev
-
-> > > > > > > release-next
-
 ## v6.27.0
 
 Date: 2024-10-11

contributors.yml

@@ -202,6 +202,7 @@
 - mtendekuyokwa19
 - mtliendo
 - ned-park
+- nikeee
 - nilubisan
 - Nismit
 - nnhjs