diff --git a/gitconfig b/gitconfig
index 12e829f..5328889 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,9 +1,17 @@
 [user]
-	name = Vasili Sviridov
-	email = vasili@sviridov.ca
+    name = Vasili Sviridov
+    email = vasili@sviridov.ca
 
 [push]
-	default = simple
+    default = simple
 
 [core]
-	editor = /usr/bin/vim
+    editor = /usr/bin/vim
+[diff]
+    tool = bcomp
+[merge]
+    tool = bcomp
+
+[mergetool "bcomp"]
+    trustExitCode = true
+    cmd = bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
diff --git a/tmux.conf b/tmux.conf
index db70d0f..31c133e 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -10,9 +10,6 @@ set -s escape-time 0
 set -g set-clipboard on
 set -g history-limit 50000
 
-set -g mouse-utf8 on
-
-setw -g utf8 on
 setw -g xterm-keys on
 setw -g automatic-rename on
 setw -g monitor-activity on
@@ -34,3 +31,5 @@ bind | split-window -h -c "#{pane_current_path}"# split horiz
 bind _ split-window -v -c "#{pane_current_path}"# split vert
 
 bind A command-prompt "rename-window '%%'"
+
+new-session # always create a session (can always `tmux a`)