diff --git a/.SpaceVim.d/autoload/myspacevim.vim b/.SpaceVim.d/autoload/myspacevim.vim
index b14a4b5..5b7d413 100644
--- a/.SpaceVim.d/autoload/myspacevim.vim
+++ b/.SpaceVim.d/autoload/myspacevim.vim
@@ -1,5 +1,22 @@
 function! myspacevim#before() abort
   set clipboard=unnamedplus
+<<<<<<< HEAD
+  #inoremap <C-a> <Home>
+  #inoremap <C-e> <End>
+
+  #call SpaceVim#custom#SPCGroupName(['b'], '+MyCustom')
+  #call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1)
+  #call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1)
+endfunction
+
+function! myspacevim#after() abort
+  set clipboard=unnamedplus
+  #inoremap <C-a> <Home>
+  #inoremap <C-e> <End>
+  call SpaceVim#custom#SPC('nore', ['b', '['], 'sbprevious', 1)
+  call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 1)
+endfunction
+=======
   "inoremap <C-a> <Home>
   "inoremap <C-e> <End>
 
@@ -16,3 +33,4 @@ function! myspacevim#after() abort
   call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 'sbnext', 1)
 endfunction
 
+>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
diff --git a/.SpaceVim.d/init.toml b/.SpaceVim.d/init.toml
index 3ed8a1d..f3eedd8 100644
--- a/.SpaceVim.d/init.toml
+++ b/.SpaceVim.d/init.toml
@@ -104,6 +104,11 @@
 [[layers]]
   name = 'lang#vim'
 
+<<<<<<< HEAD
+[[custom_plugins]]
+name = "saltstack/salt-vim"
+=======
 #[[custom_plugins]]
 #name = "saltstack/salt-vim"
+>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
 
diff --git a/.config/hexchat/commands.conf b/.config/hexchat/commands.conf
index a5d418b..95ffe5c 100644
--- a/.config/hexchat/commands.conf
+++ b/.config/hexchat/commands.conf
@@ -91,6 +91,9 @@ CMD quote WHOIS %2 %2
 NAME SLAP
 CMD me slaps a trout around a bit with a large %2
 
+<<<<<<< HEAD
+=======
 NAME SHT
 CMD msg %c %2: This channel frowns upon and discourages the use of SMS/shtspk like '%3'. See /topic for reference.
 
+>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
diff --git a/.config/yadm/bootstrap.d/gnome b/.config/yadm/bootstrap.d/gnome
deleted file mode 120000
index 66d967b..0000000
--- a/.config/yadm/bootstrap.d/gnome
+++ /dev/null
@@ -1 +0,0 @@
-gnome##os.Linux
\ No newline at end of file
diff --git a/.config/yadm/fedora.dconf b/.config/yadm/fedora.dconf
index 720505c..e4eeacf 100644
--- a/.config/yadm/fedora.dconf
+++ b/.config/yadm/fedora.dconf
@@ -14,8 +14,11 @@ session-switch-to-terminal-down='disabled'
 session-switch-to-terminal-left='disabled'
 session-switch-to-terminal-right='disabled'
 session-switch-to-terminal-up='disabled'
+<<<<<<< HEAD
+=======
 terminal-copy='<Alt>c'
 terminal-paste='<Alt>v'
+>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
 
 [com/gexperts/Tilix/profiles]
 list=['2b7c4080-0ddd-46c5-8f23-563fd3ba789d', '8b7f94c7-649c-41d6-adc7-7123a631e58e']
diff --git a/.gitconfig##o.Darwin b/.gitconfig##o.Darwin
index e5b71aa..75b7871 100644
--- a/.gitconfig##o.Darwin
+++ b/.gitconfig##o.Darwin
@@ -18,3 +18,6 @@
 	up = !git pull --prune $@ && git submodule update --init --recursive
 [credential]
     helper = osxkeychain
+[pull]
+	rebase = false
+	ff = no
diff --git a/.local/dotfiles/environment/iterm-tmux.zsh##o.Darwin b/.local/dotfiles/environment/iterm-tmux.zsh##o.Darwin
new file mode 100644
index 0000000..15086b3
--- /dev/null
+++ b/.local/dotfiles/environment/iterm-tmux.zsh##o.Darwin
@@ -0,0 +1,2 @@
+export ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX=YES
+
diff --git a/.zshrc b/.zshrc
index d420a76..47374a8 100644
--- a/.zshrc
+++ b/.zshrc
@@ -122,14 +122,21 @@ bindkey -M vicmd 'k' history-substring-search-up
 bindkey -M vicmd 'j' history-substring-search-down
 # }}} End configuration added by Zim install
 
+<<<<<<< HEAD
+=======
 # Homebrew
 eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
 
 # Set Path:
 typeset -U PATH
 PATH="$HOME/bin:$HOME/.local/bin:$PATH"
 export PATH
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
 # Portable alternative to readlink -f
 zpath() { cd -P . || return
   _out() { printf "%s$_zdlm\n" "$PWD/${1##*/}"; }