merge-fix

Author: shlipsey3

articles/active-directory/reports-monitoring/quickstart-azure-monitor-route-logs-to-storage-account.md

@@ -55,18 +55,12 @@ To use this feature, you need:
 
     ![Diagnostics settings](./media/quickstart-azure-monitor-route-logs-to-storage-account/DiagnosticSettings.png)
 
-<<<<<<< HEAD
-9. In the **Retention days** field, enter the number of days of retention you need of your log data. By default, this value is *0*, which means that logs are retained in the storage account indefinitely. If you set a different value, events older than the number of days selected are automatically cleaned up.
- 
-10. Select **Save**.
-=======
 9. After the categories have been selected, in the **Retention days** field, type in the number of days of retention you need of your log data. By default, this value is *0*, which means that logs are retained in the storage account indefinitely. If you set a different value, events older than the number of days selected are automatically cleaned up.
 
 > [!NOTE]
 > The Diagnostic settings storage retention feature is being deprecated. For details on this change, see [**Migrate from diagnostic settings storage retention to Azure Storage lifecycle management**](../../azure-monitor/essentials/migrate-to-azure-storage-lifecycle-policy.md).
 
 10. Select **Save** to save the setting.
->>>>>>> e387ef6e9f55a519e3ead71df18c6afa2b13a7eb
 
 11. Close the window to return to the Diagnostic settings pane.