6d598aa3edbfa660c89307f3bb201e643f323ef8

 1diff --git a/dot_gitconfig b/dot_gitconfig
 2index e4107c46fd460f9e2621e994dfb0da24a18838f8..a68b0a198f3c96610b9e2e67366ff0d001805c85 100644
 3--- a/dot_gitconfig
 4+++ b/dot_gitconfig
 5@@ -23,7 +23,9 @@
 6     diffFilter = delta --color-only
 7 [delta]
 8     navigate = true
 9-[merge]
10-    conflictstyle = diff3
11+    side-by-side = true
12+    line-numbers = true
13+    true-color = always
14+    syntax-theme = gruvbox-dark
15 [diff]
16-    colorMoved = default
17+    colorMoved = no