diff --git a/modules/home/nixvim/keymaps.nix b/modules/home/nixvim/keymaps.nix
index 77a44f6..7bcc90e 100644
--- a/modules/home/nixvim/keymaps.nix
+++ b/modules/home/nixvim/keymaps.nix
@@ -69,6 +69,14 @@ in {
     (mk "]b" "<Cmd>BufferNext<CR>" "後のバッファーに移動")
     (mk "<leader>bc" "<Cmd>BufferClose<CR>" "バッファーを削除")
 
+    # Git Conflict
+    (mk "<leader>gco" "<cmd>GitConflictChooseOurs<CR>" "現在のブランチを選択")
+    (mk "<leader>gct" "<cmd>GitConflictChooseTheirs<CR>" "相手のブランチを選択")
+    (mk "<leader>gcb" "<cmd>GitConflictChooseBoth<CR>" "両方を選択")
+    (mk "<leader>gcx" "<cmd>GitConflictListQf<CR>" "コンフリクト一覧")
+    (mk "]x" "<cmd>GitConflictNextConflict<CR>" "次のコンフリクト")
+    (mk "[x" "<cmd>GitConflictPrevConflict<CR>" "前のコンフリクト")
+
     # Git
     (mk "<leader>gl" "<cmd>LazyGit<CR>" "LazyGitを開く")
     (mk "<leader>gd" "<cmd>DiffviewOpen<CR>" "差分を開く")
diff --git a/modules/home/nixvim/plugins/editor/default.nix b/modules/home/nixvim/plugins/editor/default.nix
index f318854..e1c79a0 100644
--- a/modules/home/nixvim/plugins/editor/default.nix
+++ b/modules/home/nixvim/plugins/editor/default.nix
@@ -12,6 +12,7 @@
     ./conform.nix
     ./surround.nix
     ./git.nix
+    ./git-conflict.nix
     ./glance.nix
     ./flash.nix
     ./todo-comments.nix
diff --git a/modules/home/nixvim/plugins/editor/git-conflict.nix b/modules/home/nixvim/plugins/editor/git-conflict.nix
new file mode 100644
index 0000000..84d119a
--- /dev/null
+++ b/modules/home/nixvim/plugins/editor/git-conflict.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  programs.nixvim = {
+    extraPlugins = [ pkgs.vimPlugins.git-conflict-nvim ];
+    extraConfigLua = ''
+      require("git-conflict").setup()
+    '';
+  };
+}