diff --git a/src/scripts/merge_tools/git_hires_merge.sh b/src/scripts/merge_tools/git_hires_merge.sh
index a463e936b0..08f6553b28 100755
--- a/src/scripts/merge_tools/git_hires_merge.sh
+++ b/src/scripts/merge_tools/git_hires_merge.sh
@@ -14,7 +14,7 @@ export GIT_HIRES_MERGE_NON_INTERACTIVE_MODE=True
 attributes_file=".git/info/attributes"
 echo "* merge=git-hires-merge" >> "$attributes_file"
 
-
+git config merge.conflictStyle zdiff3
 git merge --no-edit "$branch2" 
 retVal=$?
 
diff --git a/src/scripts/merge_tools/gitmerge.sh b/src/scripts/merge_tools/gitmerge.sh
index 1c2032d58a..14525b86ab 100755
--- a/src/scripts/merge_tools/gitmerge.sh
+++ b/src/scripts/merge_tools/gitmerge.sh
@@ -21,7 +21,10 @@ strategy=$4
 
 # perform merge
 cd "$clone_dir" || exit 1
+
 git checkout "$branch1" --force
+git config merge.conflictstyle zdiff3
+
 echo "Running: git merge --no-edit $strategy $branch2"
 # shellcheck disable=SC2086
 git merge --no-edit $strategy "$branch2"