Resolve conflict in CHANGELOG-EE.md and CHANGELOG.md

Signed-off-by: Rémy Coutable <remy@rymai.me>

CHANGELOG-EE.md

@@ -68,6 +68,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 ### Other (3 changes)
 
+- Activated the Web IDE Button also on the main project page. !4250
 - Geo - add documentation about using shared a S3 bucket with GitLab Container Registry.
 - Geo: Improve replication status. Using pg_stat_wal_receiver.
 - Remove unaproved typo check in sast:container report.

CHANGELOG.md

@@ -165,14 +165,8 @@ entry.
 - Log and send a system hook if a blocked user attempts to login.
 - Add Gitaly Servers admin dashboard.
 
-<<<<<<< HEAD
-### Other (26 changes, 7 of them are from the community)
-
-- Activated the Web IDE Button also on the main project page. !4250
-=======
 ### Other (25 changes, 7 of them are from the community)
 
->>>>>>> upstream/master
 - Updated the katex library. !15864
 - Add modal for deleting a milestone. !16229
 - Remove unused CSS selectors for Cycle Analytics. !16270 (Takuya Noguchi)