resolved final conflict

Author: dereklh7

docs/solution-guidance/authorize-provider-hosted-add-in-users-at-run-time-by-using-oauth.md

@@ -79,11 +79,7 @@ When choosing  **Connect** on **Connect to Office 365**,  **Connect** in Control
 **TokenRepository.Connect** calls **TokenHelper.GetAuthorizationUrl** . **TokenHelper.GetAuthorizationUrl** returns the redirect URL to OAuthAuthorize.aspx using the **hostUrl** and the desired permissions on the SharePoint resource. OAuthAuthorize.aspx is used to authorize users using OAuth. When redirected to OAuthAuthorize.aspx, the user must sign in to Office 365, and then consent to the permissions the add-in is requesting, or trust the add-in. The desired permission on the SharePoint resource is **Web.Manage** . After user authorization, the code sample creates lists on the SharePoint site. To create lists on a SharePoint site, users must have **Web.Manage** permissions.
 
 > [!NOTE] 
-<<<<<<< HEAD
 > **TokenHelper.GetAuthorizationUrl** returns a URL of the form **https://contoso.sharepoint.com/_layouts/15/OAuthAuthorize.aspx?IsDlg=1&amp;client_id=\<Client ID\>&amp;scope=Web.Manage&amp;response_type=code**, where **\<Client ID\>** is the add-in's Client ID. If your add-in is registered through the Seller Dashboard, any Office 365 site can install the add-in. If your add-in is not registered through the Seller Dashboard, you must register your add-in by using appregnew.aspx, and then update Core.DynamicPermissionsWeb\web.config. To learn more, see[Register SharePoint Add-ins 2013](https://msdn.microsoft.com/library/be41a5dc-2af9-4fd9-bf4e-ad6dfa849524%28Office.15%29.aspx).
-=======
-> **TokenHelper.GetAuthorizationUrl** returns a URL of the form **`https://contoso.sharepoint.com/_layouts/15/OAuthAuthorize.aspx?IsDlg=1&amp;client_id=[Client ID]&amp;scope=Web.Manage&amp;response_type=code`** , where `[Client ID]` is the add-in's Client ID. If your add-in is registered through the Seller Dashboard, any Office 365 site can install the add-in. If your add-in is not registered through the Seller Dashboard, you must register your add-in by using appregnew.aspx, and then update Core.DynamicPermissionsWeb\web.config. To learn more, see[Register SharePoint Add-ins 2013](https://msdn.microsoft.com/library/be41a5dc-2af9-4fd9-bf4e-ad6dfa849524%28Office.15%29.aspx).
->>>>>>> 3c86fbbdd18a88a0263fc2631b64210107b089d0
 
 ```csharp
  public void Connect(string hostUrl)