diff --git a/vendor/modules.txt b/vendor/modules.txt
index 63621cd3..7ba2cbf7 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -333,16 +333,12 @@ github.com/mohae/deepcopy
 # github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe
 ## explicit
 github.com/montanaflynn/stats
-<<<<<<< HEAD
 # github.com/olivere/elastic/v7 v7.0.32
 ## explicit; go 1.17
 github.com/olivere/elastic/v7
 github.com/olivere/elastic/v7/config
 github.com/olivere/elastic/v7/uritemplates
-# github.com/pelletier/go-toml/v2 v2.1.0
-=======
 # github.com/pelletier/go-toml/v2 v2.2.2
->>>>>>> dev-lwl/consul
 ## explicit; go 1.16
 github.com/pelletier/go-toml/v2
 github.com/pelletier/go-toml/v2/internal/characters