diff --git a/.conflocal/yj72/.zshrc b/.conflocal/yj72/.zshrc
new file mode 100644
index 0000000000000000000000000000000000000000..afd001460d12076e0552e379a218a8cd59b351f3
--- /dev/null
+++ b/.conflocal/yj72/.zshrc
@@ -0,0 +1,4 @@
+bindkey "^[a" beginning-of-line
+bindkey "^[e" end-of-line
+bindkey "\e\e[D" backward-word
+bindkey "\e\e[C" forward-word
diff --git a/.vim b/.vim
index dc8c59b652152859b6d3b24e36cc3edefe04e3b7..c7d38e138f9a51eae90ee91a6d72dea35988edef 160000
--- a/.vim
+++ b/.vim
@@ -1 +1 @@
-Subproject commit dc8c59b652152859b6d3b24e36cc3edefe04e3b7
+Subproject commit c7d38e138f9a51eae90ee91a6d72dea35988edef
diff --git a/.zprofile b/.zprofile
index 74b335c2ac7e72abe1925816932c64847e6b3e03..24990c4ada9a7a1f3958a0df69d72d47be685b6e 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1 +1,3 @@
 [[ -d $HOME/bin ]] && export PATH=$HOME/bin:$PATH
+[[ -d $HOME/apps/bin ]] && export PATH="$HOME/apps/bin:$PATH"
+export EDITOR=vim
diff --git a/.zsh/zsh-syntax-highlighting b/.zsh/zsh-syntax-highlighting
index 683f4837a037e35e6a5236020e855fcd262ed48d..9396ad5c5f9cc40f461e59fe1c5fd2cb70d9b723 160000
--- a/.zsh/zsh-syntax-highlighting
+++ b/.zsh/zsh-syntax-highlighting
@@ -1 +1 @@
-Subproject commit 683f4837a037e35e6a5236020e855fcd262ed48d
+Subproject commit 9396ad5c5f9cc40f461e59fe1c5fd2cb70d9b723