diff --git a/CHANGELOG.md b/CHANGELOG.md
index 892375b7..e4b93881 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,9 +66,16 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Build, CI
 * (build) [\#340](https://github.com/Finschia/finschia/pull/340) Set Finschia/ostracon version
+<<<<<<< HEAD
 * (ci) [\#363](https://github.com/Finschia/finschia/pull/363) Replace deprecated linters with new ones (backport #361)
 * (ci) [\#364](https://github.com/Finschia/finschia/pull/364) Add RELEASE_NOTE.md to .gitignore (backport #362)
 * (swagger) [\#372](https://github.com/Finschia/finschia/pull/372) Add fswap and fbridge swagger settings in swagger config (backport #371)
+=======
+* (ci) [\#361](https://github.com/Finschia/finschia/pull/361) Replace deprecated linters with new ones
+* (ci) [\#362](https://github.com/Finschia/finschia/pull/362) Add RELEASE_NOTE.md to .gitignore
+* (swagger) [\#371](https://github.com/Finschia/finschia/pull/371) Add fswap and fbridge swagger settings in swagger config
+* (build) [\#388](https://github.com/Finschia/finschia/pull/388) Modify the way the binary version is set when compiling
+>>>>>>> 7d99e17 (chore: Modify the way the binary version is set when compiling (#388))
 
 
 ## [v3.0.0] - 2024-03-04
diff --git a/Makefile b/Makefile
index 7401578f..96d51eb6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,12 @@
 
 COMMIT ?= $(shell git log -1 --format='%H')
 
-# ascribe tag only if on a release/ branch, otherwise pick branch name and concatenate commit hash
+# Specify a tag only if it has a specific tag, otherwise choose a branch name and concatenate the commit hash.
 ifeq (,$(VERSION))
   BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
   VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//')
-  ifeq (, $(findstring release/,$(BRANCH)))
+  SHORT_COMMIT := $(shell git log -1 --format='%h')
+  ifneq (, $(findstring $(SHORT_COMMIT),$(VERSION)))
     VERSION = $(subst /,_,$(BRANCH))-$(COMMIT)
   endif
 endif