diff --git a/config.toml b/config.toml
index 2310a26557e..d5c2a78872b 100644
--- a/config.toml
+++ b/config.toml
@@ -146,12 +146,8 @@ weight     = "4"
 [[menu.main]]
 identifier = "learn"
 name       = "Learn"
-<<<<<<< HEAD
 url        = "https://rancher.com/learn/"
 weight     = "4"
-=======
-weight     = "5"
->>>>>>> add customers to main nav
 pre        = "<i class='material-icons'>keyboard_arrow_down</i>"
 
   [[menu.main]]