Updated meta, round 3

niklarin · niklarin · commit 3b284df591b3 · 2023-03-24T11:09:24.000-07:00
diff --git a/articles/cosmos-db/postgresql/concepts-compute-start-stop.md b/articles/cosmos-db/postgresql/concepts-compute-start-stop.md
@@ -2,17 +2,10 @@
 title: Start and stop cluster compute - Azure Cosmos DB for PostgreSQL
 description: Learn about how to start and stop compute on the cluster nodes
 ms.author: nlarin
-<<<<<<< HEAD
 author: niklarin
 ms.service: cosmos-db
 ms.subservice: postgresql
 ms.topic: conceptual
-=======
-author: niklarin-msft
-ms.service: cosmos-db
-ms.subservice: postgresql
-ms.topic: concept
->>>>>>> 220e79fd5bf968b7f4e63757021f184f50f6795a
 ms.date: 3/22/2023
 ---
 # Start and stop compute on cluster nodes
diff --git a/articles/cosmos-db/postgresql/how-to-start-stop-cluster.md b/articles/cosmos-db/postgresql/how-to-start-stop-cluster.md
@@ -2,11 +2,7 @@
 title: Start and stop cluster - Azure Cosmos DB for PostgreSQL
 description: How to start and stop compute on the cluster nodes
 ms.author: nlarin
-<<<<<<< HEAD
 author: niklarin
-=======
-author: niklarin-msft
->>>>>>> 220e79fd5bf968b7f4e63757021f184f50f6795a
 ms.service: cosmos-db
 ms.subservice: postgresql
 ms.topic: how-to
