From a12f84a67da77b812b2d5aedcfc484600e9a9fe3 Mon Sep 17 00:00:00 2001
From: TomShawn <41534398+TomShawn@users.noreply.github.com>
Date: Wed, 17 Jun 2020 11:17:10 +0800
Subject: [PATCH] change 2 aliases in 4.0

---
 deploy-monitoring-services.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/deploy-monitoring-services.md b/deploy-monitoring-services.md
index 4ce8374c8a4dc..068e7672d2655 100644
--- a/deploy-monitoring-services.md
+++ b/deploy-monitoring-services.md
@@ -2,11 +2,7 @@
 title: Deploy Monitoring Services for the TiDB Cluster
 summary: Learn how to deploy monitoring services for the TiDB cluster.
 category: how-to
-<<<<<<< HEAD:monitor-a-tidb-cluster.md
-aliases: ['/docs/stable/how-to/monitor/monitor-a-cluster/']
-=======
-aliases: ['/docs/dev/how-to/monitor/monitor-a-cluster/','/docs/dev/monitor-a-tidb-cluster/']
->>>>>>> 81d016b... add 3 monitoring documents (#2791):deploy-monitoring-services.md
+aliases: ['/docs/stable/how-to/monitor/monitor-a-cluster/','/docs/stable/monitor-a-tidb-cluster/']
 ---
 
 # Deploy Monitoring Services for the TiDB Cluster