diff --git a/.SpaceVim.d/autoload/myspacevim.vim b/.SpaceVim.d/autoload/myspacevim.vim
index 5b7d413..38cc131 100644
--- a/.SpaceVim.d/autoload/myspacevim.vim
+++ b/.SpaceVim.d/autoload/myspacevim.vim
@@ -1,36 +1,18 @@
 function! myspacevim#before() abort
   set clipboard=unnamedplus
-<<<<<<< HEAD
-  #inoremap <C-a> <Home>
-  #inoremap <C-e> <End>
+  " 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)
+  " 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>
+  " 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>
 
-  "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', 'sbprevious', 1)
-  call SpaceVim#custom#SPC('nore', ['b', ']'], 'sbnext', 'sbnext', 1)
-endfunction
-
->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec
diff --git a/.SpaceVim.d/init.toml b/.SpaceVim.d/init.toml
index f3eedd8..c1f0192 100644
--- a/.SpaceVim.d/init.toml
+++ b/.SpaceVim.d/init.toml
@@ -104,11 +104,6 @@
 [[layers]]
   name = 'lang#vim'
 
-<<<<<<< HEAD
 [[custom_plugins]]
 name = "saltstack/salt-vim"
-=======
-#[[custom_plugins]]
-#name = "saltstack/salt-vim"
->>>>>>> beb612e4b5104113b2edd4e269cfa058a59a3bec