diff --git a/dot_config/task/taskrc b/dot_config/task/taskrc
index dce698a..67a60f8 100644
--- a/dot_config/task/taskrc
+++ b/dot_config/task/taskrc
@@ -91,6 +91,6 @@ context.work.write=+work
 context.home.read=-work +home or -TAGGED
 context.home.write=+home
 
-include ~/.config/task/intheam
+#include ~/.config/task/intheam
 #include ~/.config/task/wingtask
 context=work
diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 6cd52ea..b996e98 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -51,4 +51,4 @@
 [help]
 	autocorrect = 20
 [merge]
-	conflictstyle = diff3
+	conflictstyle = zdiff3
diff --git a/dot_taskopenrc b/dot_taskopenrc
index d394fbb..6223218 100644
--- a/dot_taskopenrc
+++ b/dot_taskopenrc
@@ -24,6 +24,6 @@ url.regex="((?:www|http).*)"
 url.command="/usr/bin/xdg-open $LAST_MATCH"
 url.modes="batch,any,normal"
 thunderlink.regex="(cb)?thunderlink:.*"
-thunderlink.command="/usr/bin/xdg-open $FILE"
+thunderlink.command="/home/kellya/bin/cb_thunderlink/cb_thunderlink $FILE"
 joplin.regex="joplin:.*"
 joplin.command="/home/kellya/.joplin/Joplin.AppImage $FILE"