diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..7ad3032
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,49 @@
+[user]
+	email = mitchel@organiq.nl
+	name = Mitchel
+[column]
+        ui = auto
+[branch]
+        sort = -committerdate
+[tag]
+        sort = version:refname
+[init]
+        defaultBranch = main
+[diff]
+        algorithm = histogram
+        colorMoved = plain
+        mnemonicPrefix = true
+        renames = true
+[push]
+        default = simple
+        autoSetupRemote = true
+        followTags = true
+[fetch]
+        prune = true
+        pruneTags = true
+        all = true
+
+[help]
+        autocorrect = prompt
+[commit]
+        verbose = true
+[rerere]
+        enabled = true
+        autoupdate = true
+[core]
+        excludesfile = ~/.gitignore
+[rebase]
+        autoSquash = true
+        autoStash = true
+        updateRefs = true
+
+# a matter of taste (uncomment if you dare)
+
+[core]
+        # fsmonitor = true
+        # untrackedCache = true
+[merge]
+        # (just 'diff3' if git version < 2.3)
+        conflictstyle = zdiff3 
+[pull]
+        rebase = true
diff --git a/config/wezterm/wezterm.lua b/config/wezterm/wezterm.lua
index 696d73d..b876296 100644
--- a/config/wezterm/wezterm.lua
+++ b/config/wezterm/wezterm.lua
@@ -2,12 +2,27 @@ local wezterm = require("wezterm")
 local config = {}
 local act = wezterm.action
 local os_name = os.getenv("OS")
+<<<<<<< Updated upstream
+||||||| Stash base
+=======
 
 if os_name and os_name:lower():find("windows") then
 	config.default_prog = { "pwsh.exe" }
 else
 	config.default_prog = { "/usr/bin/fish" }
 end
+>>>>>>> Stashed changes
+
+<<<<<<< Updated upstream
+if os_name and os_name:lower():find("windows") then
+	config.default_prog = { "pwsh.exe" }
+else
+	config.default_prog = { "/usr/bin/fish" }
+end
+||||||| Stash base
+config.default_prog = { "/usr/bin/fish" }
+=======
+>>>>>>> Stashed changes
 config.default_cwd = "~"
 config.initial_rows = 36
 config.initial_cols = 132