Merge conflict

.claude/settings.local.json

@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "WebSearch"
+    ]
+  }
+}

.tmux.conf

@@ -77,9 +77,13 @@ bind -n C-k select-pane -D
 # switch windows using Ctrl + Tab
 bind -n C-Tab next-window
 
+bind q killp
+
 # Enable mouse
 set -g mouse on
 
 set-option -g status-position top
 # set -g status-right '[#(gitmux "#{pane_current_path}")] %m.%d.%y %H:%M'
 set -g status-right '%m.%d.%Y %H:%M '
+
+set-option -g allow-rename off

.vimrc

@@ -90,7 +90,7 @@ Plugin 'mattn/emmet-vim'
 " Plugin 'jiangmiao/auto-pairs'
 Plugin 'ctrlpvim/ctrlp.vim'
 Plugin 'junegunn/vim-easy-align'
-Plugin 'instant-markdown/vim-instant-markdown'
+" Plugin 'instant-markdown/vim-instant-markdown'
 Plugin 'ervandew/supertab'
 Plugin 'leafgarland/typescript-vim'
 Plugin 'dense-analysis/ale'