From 6fbb9ada664bdd114554913196ebfe742f3e0101 Mon Sep 17 00:00:00 2001
From: Ayo <ayo@ayco.io>
Date: Fri, 3 Jul 2026 15:00:29 +0200
Subject: [PATCH] Merge conflict

---
 .claude/settings.local.json | 7 +++++++
 .tmux.conf                  | 4 ++++
 .vimrc                      | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 .claude/settings.local.json

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
new file mode 100644
index 0000000..0a37a01
--- /dev/null
+++ b/.claude/settings.local.json
@@ -0,0 +1,7 @@
+{
+  "permissions": {
+    "allow": [
+      "WebSearch"
+    ]
+  }
+}
diff --git a/.tmux.conf b/.tmux.conf
index 16e8961..c4920ce 100644
--- a/.tmux.conf
+++ b/.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
diff --git a/.vimrc b/.vimrc
index 224f356..6754f7e 100644
--- a/.vimrc
+++ b/.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'