diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index 9366081..ff3f4bc 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -1,16 +1,8 @@
 return {
-<<<<<<< Updated upstream
 	"folke/tokyonight.nvim",
 	lazy = false,
 	priority = 1000,
 	config = function()
 		vim.cmd([[colorscheme tokyonight]])
-=======
-	"Th3Whit3Wolf/one-nvim",
-	lazy = false, -- make sure we load this during startup if it is your main colorscheme
-	priority = 1000, -- make sure to load this before all the other start plugins
-	config = function()
-	--	vim.cmd([[colorscheme one-nvim]])
->>>>>>> Stashed changes
 	end,
 }