diff --git a/init.lua b/init.lua
index 5b5288a..1bffc01 100644
--- a/init.lua
+++ b/init.lua
@@ -1,7 +1,7 @@
 vim.loader.enable()
 
 if vim.g.neovide then
-	require 'neovide'
+	require("neovide")
 else
 	vim.opt.termguicolors = true
 end
@@ -29,4 +29,8 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
-require('lazy').setup('plugins')
+require("lazy").setup("plugins")
+vim.api.nvim_create_autocmd("FileType", {
+	pattern = { "*.yaml", "*.yml" },
+	command = "setlocal tabstop=2 shiftwidth=2 expandtab",
+})
diff --git a/lazy-lock.json b/lazy-lock.json
index 8818282..8fca889 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -22,6 +22,7 @@
   "everforest": { "branch": "master", "commit": "c3b375b5fb2a07c3b75f24fefb8a7031015d8231" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
   "fzf-lua": { "branch": "main", "commit": "8a63c9e7998a51319c3cc118bb38241c18acc9c8" },
+  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
   "gitsigns.nvim": { "branch": "main", "commit": "4baa13519c2168cc9a7890a3580c50226ed018fb" },
   "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
   "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
@@ -61,5 +62,6 @@
   "typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" },
   "vim-twee-sugarcube": { "branch": "main", "commit": "c514622b4a57f39ebb9c3adb9f2d0ba77fa1115a" },
   "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" },
+  "yaml-companion.nvim": { "branch": "main", "commit": "131b0d67bd2e0f1a02e0daf2f3460482221ce3c0" },
   "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
 }
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 64c03f6..14d5889 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -61,6 +61,19 @@ return {
 			},
 		},
 	},
+	{
+		"someone-stole-my-name/yaml-companion.nvim",
+		dependencies = {
+			{ "neovim/nvim-lspconfig" },
+			{ "nvim-lua/plenary.nvim" },
+			{ "nvim-telescope/telescope.nvim" },
+		},
+		config = function()
+			local cfg = require("yaml-companion").setup({})
+			require("telescope").load_extension("yaml_schema")
+			require("lspconfig")["yamlls"].setup(cfg)
+		end,
+	},
 	{
 		"rose-pine/neovim",
 		name = "rose-pine",
diff --git a/lua/plugins/editing.lua b/lua/plugins/editing.lua
index 0c76925..8965738 100644
--- a/lua/plugins/editing.lua
+++ b/lua/plugins/editing.lua
@@ -24,6 +24,7 @@ return {
 			"julia",
 		},
 	},
+	{ "akinsho/git-conflict.nvim", version = "*", config = true },
 	{
 		"utilyre/sentiment.nvim",
 		version = "*",