diff --git a/.SpaceVim.d/init.toml b/.SpaceVim.d/init.toml
index 312f756..ca59441 100644
--- a/.SpaceVim.d/init.toml
+++ b/.SpaceVim.d/init.toml
@@ -21,6 +21,7 @@
     statusline_separator = "arrow"
     statusline_inactive_separator = "arrow"
     buffer_index_type = 4
+    autocomplete_method = 'deoplete'
     enable_tabline_filetype_icon = true
     enable_statusline_display_mode = false
     vim_help_language = "cn"
@@ -61,4 +62,7 @@ name = "fzf"
 [[layers]]
 name = "VersionControl"
 
+[[layers]]
+name = "tmux"
+
 
diff --git a/.gitconfig b/.gitconfig
index aafe117..d9a70a4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,3 +14,5 @@
     br = branch
 [push]
 	default = current
+[merge]
+    tool = vimdiff
diff --git a/.tmux.conf b/.tmux.conf
index 6caf243..4ad46f8 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,6 +1,7 @@
 setw -g mode-keys vi
 unbind ^b
-set -g prefix 'C-a'
+#set -g prefix 'C-a'
+set -g prefix `
 bind r source-file ~/.tmux.conf \; display-message "Config reloaded"
 
 # 切分面板