diff --git a/completion.lua b/completion.lua
index 7d142cb..7528723 100644
--- a/completion.lua
+++ b/completion.lua
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 -- Set completeopt to have a better completion experience
 -- :help completeopt
 -- menuone: popup even when there's only one match
diff --git a/default.nix b/default.nix
index 855b5db..0511177 100644
--- a/default.nix
+++ b/default.nix
@@ -60,6 +60,9 @@ in
       cmp-cmdline
       rustaceanvim
       (if config.programs.neovim.package.version == "0.10.0" then throw "lsp-inlayhints-nvim may be removed" else lsp-inlayhints-nvim) # https://github.com/mrcjkb/rustaceanvim/discussions/46#discussioncomment-7620822
+      cmp-conventionalcommits
+      cmp-calc
+      rust-tools-nvim
       plenary-nvim
       crates-nvim
       nvim-lspconfig