diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
index 10fe30b..7d388fa 100644
--- a/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
+++ b/src/main/java/net/geedge/asw/module/app/service/impl/ApplicationMergeServiceImpl.java
@@ -254,8 +254,9 @@ public class ApplicationMergeServiceImpl extends ServiceImpl<ApplicationMergeDao
 
                 // merge
                 try {
-                    String commitId = gitService.mergeBranch(workspaceId, srcBranch, tgtBranch, message, null);
-                    entity.setEndCommitId(commitId);
+                    gitService.mergeBranch(workspaceId, srcBranch, tgtBranch, message, null);
+                    String latestCommitId = gitService.getLatestCommitId(workspaceId, srcBranch);
+                    entity.setEndCommitId(latestCommitId);
                     entity.setStatus(MergeRequestStatus.MERGED.toString());
                 } catch (Exception e) {
                     log.error(e, "[newMr] [merge error] [workspaceId: {}] [srcBranch: {}] [tgtBranch: {}] [msg: {}]", workspaceId, srcBranch, tgtBranch, e.getMessage());
diff --git a/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java b/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
index ae051c3..01f99ea 100644
--- a/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
+++ b/src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
@@ -477,7 +477,7 @@ public class GitServiceImpl implements IGitService {
 
             // checout
             git.checkout()
-                    .setCreateBranch(true)
+                    .setCreateBranch(T.StrUtil.equals("main", tgtBranch) ? false : true)
                     .setName(tgtBranch)
                     .setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.TRACK)
                     .setStartPoint("origin/" + tgtBranch)