Fixed merge issue and link

Author: Mattp123

powerapps-docs/maker/common-data-service/solution-best-practices.md

@@ -33,7 +33,7 @@ To update the app that was included in the managed solution, use update or patch
 
 
 ## Use security roles to manage app access
-Model-driven apps should have security roles assigned to control user access. More information: [Add security roles to the app](../model-driven-apps/share-model-driven-app.md#add-security-roles-to-the-app) 
+Model-driven apps should have security roles assigned to control user access. More information: [Share a model-driven app with Power Apps](../model-driven-apps/share-model-driven-app.md) 
 
 ## Delete the managed solution to delete a model-driven app 
 To delete a model-driven app that was installed in the default solution as part of a managed solution, delete the managed solution. 

powerapps-docs/maker/model-driven-apps/share-model-driven-app.md

@@ -64,8 +64,6 @@ For more information about access and scope privileges, see [Security roles](htt
 1. On the [!INCLUDE [powerapps](../../includes/powerapps.md)] site select **Apps**, next to the app you want to share select **…**, and  then select **Share**.
 
 2. Select the app then expand the list of security roles.
-=======
-2. From the **Share this app** dialog, under **Create a security role** select **Security Setting**.
 
 3. On the **All Roles** page, select **New**.