diff --git a/.github/workflows/pr-comment-ci.yml b/.github/workflows/pr-comment-ci.yml
index a523c72e..0bc14bc5 100644
--- a/.github/workflows/pr-comment-ci.yml
+++ b/.github/workflows/pr-comment-ci.yml
@@ -106,28 +106,37 @@ jobs:
           ssr_snap_conflict=$(git status | grep 'both modified:' | grep -c 'ssr.test.jsx.snap')
           common_conflict=$(git status | grep 'both modified:' | grep -c '_common')
           conflicts_sum=$((csr_snap_conflict + ssr_snap_conflict + common_conflict))
+          echo "conflict_count: $conflict_count"
+          echo "working_tree_clean: $working_tree_clean"
+          echo "csr_snap_conflict: $csr_snap_conflict"
+          echo "ssr_snap_conflict: $ssr_snap_conflict"
+          echo "common_conflict: $common_conflict"
+          echo "conflicts_sum: $conflicts_sum"
 
           if [ "$working_tree_clean" -eq "1" ]; then
-            echo "nothing to commit, working tree clean"
-            exit 0
+              echo "nothing to commit, working tree clean"
+              exit 0
           fi
 
           if [ "$conflict_count" -gt "0" ]&&[ "$conflicts_sum" -eq "0" ]; then
-            echo "Unknown conflict "
-            git status
-            exit 1
+              echo "Unknown conflict "
+              git status
+              exit 1
           fi
 
           if [ "$csr_snap_conflict" -eq "1" ];then
-              git checkout --theirs test/snap/__snapshots__/csr.test.jsx.snap
+              git checkout -f develop test/snap/__snapshots__/csr.test.jsx.snap
+              echo "resolve conflict csr.test.jsx.snap"
           fi
 
           if [ "$ssr_snap_conflict" -eq "1" ];then
-              git checkout --theirs test/snap/__snapshots__/ssr.test.jsx.snap
+              git checkout -f develop test/snap/__snapshots__/ssr.test.jsx.snap
+              echo "resolve conflict ssr.test.jsx.snap"
           fi
 
           if [ "$common_conflict" -eq "1" ];then
-              git checkout --theirs src/_common
+              git checkout -f develop src/_common
+              echo "resolve conflict _common"
           fi
 
           git commit -am "chore: merge develop"