Merge pull request #3073 from MicrosoftDocs/pehecke-PR3065-conflicts

Accepted incoming changes/conflict resolution from PR 3065

Author: phecke

powerapps-docs/developer/common-data-service/best-practices/work-with-data/index.md

@@ -1,39 +1,3 @@
-<<<<<<< HEAD
----
-title: "Developers: Best practices and guidance around working with data for the Common Data Service | Microsoft Docs"
-description: Best practices and guidance around working with data for developers of the Common Data Service in Power Apps.
-services: ''
-suite: powerapps
-documentationcenter: na
-author: jowells
-manager: austinj
-editor: ''
-tags: ''
-ms.service: powerapps
-ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: na
-ms.date: 12/12/2018
-ms.author: jowells
-search.audienceType: 
-  - developer
-search.app: 
-  - PowerApps
-  - D365CE
----
-
-# Best practices and guidance around working with data for the Common Data Service
-
-This list below contains all of the best practices and guidance around integrating data using code with the Common Data Service.
-
-|Best Practice  |Description  |
-|---------|---------|
-|[Service Protection API Limits (Common Data Service)](../../api-limits.md)     |Understand the limits for API requests.         |
-
-### See Also
-[Work with data using code in Common Data Service (PowerApps)](../../work-with-data-cds.md)<br />
-=======
 ---
 title: "Developers: Best practices and guidance around working with data for the Common Data Service | Microsoft Docs"
 description: Best practices and guidance around working with data for developers of the Common Data Service in Power Apps.
@@ -68,4 +32,3 @@ This list below contains all of the best practices and guidance around integrati
 
 ### See Also
 [Work with data using code in Common Data Service (Power Apps)](../../work-with-data-cds.md)<br />
->>>>>>> ae864535ae5aab1966c3c5bd8c4250316a788d91