diff --git a/completion.lua b/completion.lua
index 7528723..7d142cb 100644
--- a/completion.lua
+++ b/completion.lua
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 -- Set completeopt to have a better completion experience
 -- :help completeopt
 -- menuone: popup even when there's only one match