fix merge conflict

Author: AFTOwen

powerapps-docs/administrator/admin-manage-apps.md

@@ -31,7 +31,7 @@ Admins can do the following from the PowerApps Admin center:
 * PowerApps Environment Admin, Office 365 Global Admin, or Azure Active Directory Tenant Admin permissions. For more information, see [Environments administration in PowerApps](environments-administration.md).
 
 ## Manage an app
-1. Sign in to the Admin center at [https://admin.powerapps.com]([https://admin.powerapps.com).
+1. Sign in to the Admin center at [https://admin.powerapps.com](https://admin.powerapps.com).
 2. In the navigation pane, click or tap **Environments**, and then click or tap the environment that contains the app that you want to manage.
 
     If you don't see **Environments** in the navigation pane, that indicates you don't have a PowerApps Plan 2, Microsoft Flow Plan 2, or PowerApps Plan 2 trial license.

powerapps-docs/maker/TOC.yml

@@ -42,7 +42,11 @@
       - name: Customize a card
         href: ./canvas-apps/customize-card.md
     - name: Create an app from scratch
-      href: ./canvas-apps/data-platform-create-app-scratch.md
+      items:
+      - name: Common Data Service for Apps
+        href: ./canvas-apps/data-platform-create-app-scratch.md
+      - name: Excel
+        href: ./canvas-apps/get-started-create-from-blank.md
     - name: Share an app
       href: ./canvas-apps/share-app.md
     - name: Embed an app in Power BI
@@ -95,8 +99,6 @@
     items:
     - name: Customize a SharePoint list form
       href: ./canvas-apps/customize-list-form.md
-    - name: Build an Excel app from scratch
-      href: ./canvas-apps/get-started-create-from-blank.md
     - name: Customize an app
       items:
       - name: Add and configure a control

powerapps-docs/maker/canvas-apps/controls/control-add-picture.md

@@ -1,19 +1,16 @@
 ---
 title: 'Add picture control: reference | Microsoft Docs'
 description: Information, including properties and examples, about the Add picture control
-services: ''
-suite: powerapps
 documentationcenter: na
 author: fikaradz
-manager: anneta
+manager: kfile
 editor: ''
 tags: ''
 
 ms.service: powerapps
 ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: na
+ms.topic: reference
+ms.component: canvas
 ms.date: 10/25/2016
 ms.author: fikaradz
 

powerapps-docs/maker/canvas-apps/controls/control-attachments.md

@@ -1,19 +1,16 @@
 ---
 title: 'Attachments control: reference | Microsoft Docs'
 description: Information, including properties and examples, about the Attachments control
-services: ''
-suite: powerapps
 documentationcenter: na
 author: fikaradz
-manager: anneta
+manager: kfile
 editor: ''
 tags: ''
 
 ms.service: powerapps
 ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: na
+ms.topic: reference
+ms.component: canvas
 ms.date: 04/23/2018
 ms.author: fikaradz
 

powerapps-docs/maker/canvas-apps/controls/control-audio-video.md

@@ -1,19 +1,16 @@
 ---
 title: 'Audio and Video controls: reference | Microsoft Docs'
 description: Information, including properties and examples, about the Audio and Video controls
-services: ''
-suite: powerapps
 documentationcenter: na
 author: fikaradz
-manager: anneta
+manager: kfile
 editor: ''
 tags: ''
 
 ms.service: powerapps
 ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: na
+ms.topic: reference
+ms.component: canvas
 ms.date: 10/25/2016
 ms.author: fikaradz
 

powerapps-docs/maker/canvas-apps/controls/control-barcodescanner.md

@@ -1,19 +1,16 @@
 ---
 title: 'Barcode scanner control: reference | Microsoft Docs'
 description: Information, including properties and examples, about the barcode scanner control
-services: ''
-suite: powerapps
 documentationcenter: na
 author: fikaradz
-manager: anneta
+manager: kfile
 editor: ''
 tags: ''
 
 ms.service: powerapps
 ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: na
+ms.topic: reference
+ms.component: canvas
 ms.date: 10/25/2016
 ms.author: fikaradz
 

powerapps-docs/maker/canvas-apps/controls/control-button.md

@@ -1,19 +1,16 @@
 ---
 title: 'Button control: reference | Microsoft Docs'
 description: Information, including properties and examples, about the Button control
-services: ''
-suite: powerapps
 documentationcenter: na
 author: fikaradz
-manager: anneta
+manager: kfile
 editor: ''
 tags: ''
 
 ms.service: powerapps
 ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: na
+ms.topic: reference
+ms.component: canvas
 ms.date: 10/25/2016
 ms.author: fikaradz
 

powerapps-docs/maker/canvas-apps/controls/control-camera.md

@@ -1,19 +1,16 @@
 ---
 title: 'Camera control: reference | Microsoft Docs'
 description: Information, including properties and examples, about the Camera control
-services: ''
-suite: powerapps
 documentationcenter: na
 author: fikaradz
-manager: anneta
+manager: kfile
 editor: ''
 tags: ''
 
 ms.service: powerapps
 ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: na
+ms.topic: reference
+ms.component: canvas
 ms.date: 10/25/2016
 ms.author: fikaradz
 

powerapps-docs/maker/canvas-apps/controls/control-card.md

@@ -1,19 +1,16 @@
 ---
 title: 'Card control: reference | Microsoft Docs'
 description: Information, including properties and examples, about the Card control
-services: ''
-suite: powerapps
 documentationcenter: na
 author: gregli-msft
-manager: anneta
+manager: kfile
 editor: ''
 tags: ''
 
 ms.service: powerapps
 ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: na
+ms.topic: reference
+ms.component: canvas
 ms.date: 10/25/2016
 ms.author: gregli
 

powerapps-docs/maker/canvas-apps/controls/control-check-box.md

@@ -1,19 +1,16 @@
 ---
 title: 'Check Box control: reference | Microsoft Docs'
 description: Information, including properties and examples, about the Check Box control
-services: ''
-suite: powerapps
 documentationcenter: na
 author: fikaradz
-manager: anneta
+manager: kfile
 editor: ''
 tags: ''
 
 ms.service: powerapps
 ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: na
+ms.topic: reference
+ms.component: canvas
 ms.date: 10/25/2016
 ms.author: fikaradz