diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0395c569..a32c164cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-<<<<<<< HEAD
 # [7.4.0](https://github.com/ionic-team/ionicons/compare/v7.3.1...v7.4.0) (2024-05-01)
 
 
diff --git a/package.json b/package.json
index 3c73a0a85..78f3be875 100755
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "ionicons",
-<<<<<<< HEAD
   "version": "7.4.0",
-=======
-  "version": "7.3.1",
->>>>>>> origin/main
   "description": "Premium icons for Ionic.",
   "files": [
     "components/",