diff --git a/internal/git/conflict/resolve.go b/internal/git/conflict/resolve.go
index 1b970220e926021f1beca4bbde6c94dcde81e98c..f61aef5480dc367b97ddfe1883a76f5a81ad3cd8 100644
--- a/internal/git/conflict/resolve.go
+++ b/internal/git/conflict/resolve.go
@@ -3,7 +3,7 @@ package conflict
 import (
 	"bufio"
 	"bytes"
-	"crypto/sha1"
+	"crypto/sha256"
 	"errors"
 	"fmt"
 	"io"
@@ -252,3 +252,4 @@ func Resolve(src io.Reader, ours, theirs git.ObjectID, path string, resolution R
 
 	return &resolvedContent, nil
 }
+