diff --git a/dots/.nvim-environments/primary/config/lua/plugins/configs/_neoclip.lua b/dots/.nvim-environments/primary/config/lua/plugins/configs/_neoclip.lua
index 1cb35ebe..78dabca2 100755
--- a/dots/.nvim-environments/primary/config/lua/plugins/configs/_neoclip.lua
+++ b/dots/.nvim-environments/primary/config/lua/plugins/configs/_neoclip.lua
@@ -1,17 +1,3 @@
-<<<<<<< HEAD
-local loaded, neoclip = pcall(require, "neoclip")
-if not loaded then
-    return
-end
-neoclip.setup({
-||||||| b136610 (feat(nvim): use loaded, plugin format)
-local neoclip = pcall(require, "neoclip")
-if not neoclip then
-    return
-end
-neoclip.setup({
-=======
-require('neoclip').setup({
->>>>>>> parent of b136610 (feat(nvim): use loaded, plugin format)
+require("neoclip").setup({
     enable_persistent_history = true,
 })