diff --git a/docs/operator/_index.md b/docs/operator/_index.md
index b43dd6b03..3b7653765 100644
--- a/docs/operator/_index.md
+++ b/docs/operator/_index.md
@@ -1,9 +1,12 @@
 ---
 weight: 0
 title: Operator
+<<<<<<< Updated upstream
 menu:
   docs:
     weight: 0
+=======
+>>>>>>> Stashed changes
 aliases:
   - /operator/
   - /operator/index.html