diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ab86fd9..0f892a9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,9 @@
-
 # Changelog
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-<<<<<<< HEAD
-### Features
+### [4.2.1](https://github.com/nash-io/nash-protocol/compare/v4.0.15...v4.2.1) (2021-07-05)
 
-* generate AVAXC APIKeys ([453adb3](https://github.com/nash-io/nash-protocol/commit/453adb31acb53f157d4807cf138bbec86253482f))
-=======
 ### [4.1.5](https://github.com/nash-io/nash-protocol/compare/v4.1.3...v4.1.5) (2021-05-27)
 
 >>>>>>> 64bb461 (chore(release): 4.1.5)
diff --git a/package.json b/package.json
index 866d4af7..32a00eb2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@neon-exchange/nash-protocol",
-  "version": "4.1.5",
+  "version": "4.2.1",
   "description": "TypeScript implementation of Nash crypto routines",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
@@ -89,4 +89,4 @@
       "**/*.spec.js"
     ]
   }
-}
\ No newline at end of file
+}