machine --> device updates

windows/security/threat-protection/microsoft-defender-atp/machines-view-overview.md

@@ -53,7 +53,7 @@ The risk level reflects the overall risk assessment of the device based on a com
 
 ### Exposure level
 
-The exposure level reflects the current exposure of the machine based on the cumulative impact of its pending security recommendations. The possible levels are low, medium, and high. Low exposure means your machines are less vulnerable from exploitation.
+The exposure level reflects the current exposure of the device based on the cumulative impact of its pending security recommendations. The possible levels are low, medium, and high. Low exposure means your devices are less vulnerable from exploitation.
 
 If the exposure level says "No data available," there are a few reasons why this may be the case:
 

windows/security/threat-protection/microsoft-defender-atp/portal-overview.md

@@ -80,13 +80,8 @@ Icon | Description
 ![Remediated icon](images/remediated-icon.png)| Remediated – Threat removed from the device.
 ![Not remediated icon](images/not-remediated-icon.png)| Not remediated – Threat not removed from the device.
 ![Thunderbolt icon](images/atp-thunderbolt-icon.png)| Indicates events that triggered an alert in the **Alert process tree**.
-<<<<<<< HEAD
 ![Device icon](images/atp-machine-icon.png)| Device icon
-![Windows Defender AV events icon](images/atp-windows-defender-av-events-icon.png)| Windows Defender Antivirus events
-=======
-![Machine icon](images/atp-machine-icon.png)| Machine icon
 ![Windows Defender AV events icon](images/atp-windows-defender-av-events-icon.png)| Microsoft Defender Antivirus events
->>>>>>> master
 ![Application Guard events icon](images/atp-Application-Guard-events-icon.png)| Windows Defender Application Guard events
 ![Device Guard events icon](images/atp-Device-Guard-events-icon.png)| Windows Defender Device Guard events
 ![Exploit Guard events icon](images/atp-Exploit-Guard-events-icon.png)| Windows Defender Exploit Guard events

windows/security/threat-protection/microsoft-defender-atp/respond-machine-alerts.md

@@ -129,13 +129,8 @@ The Action center will show the scan information and the device timeline will in
 In addition to containing an attack by stopping malicious processes, you can also lock down a device and prevent subsequent attempts of potentially malicious programs from running.
 
 >[!IMPORTANT]
-<<<<<<< HEAD
-> - This action is available for devices on Windows 10, version  1709 or later.
-> - This feature is available if your organization uses Windows Defender Antivirus.
-=======
 > - This action is available for machines on Windows 10, version  1709 or later.
 > - This feature is available if your organization uses Microsoft Defender Antivirus.
->>>>>>> master
 > - This action needs to meet the Windows Defender Application Control code integrity policy formats and signing requirements. For more information, see [Code integrity policy formats and signing](https://docs.microsoft.com/windows/device-security/device-guard/requirements-and-deployment-planning-guidelines-for-device-guard#code-integrity-policy-formats-and-signing).
 
 To restrict an application from running, a code integrity policy is applied that only allows files to run if they are signed by a Microsoft issued certificate. This method of restriction can help prevent an attacker from controlling compromised devices and performing further malicious activities.

windows/security/threat-protection/microsoft-defender-atp/web-content-filtering.md

@@ -110,11 +110,11 @@ To add a new policy:
 1. Select **Add policy** on the **Web content filtering** page in **Settings**.
 2. Specify a name.
 3. Select the categories to block. Use the expand icon to fully expand each parent category and select specific web content categories.
-4. Specify the policy scope. Select the device groups to specify where to apply the policy. Only machines in the selected machine groups will be prevented from accessing websites in the selected categories.
-5. Review the summary and save the policy. The policy may take up to 15 minutes to apply to your selected machines.
+4. Specify the policy scope. Select the device groups to specify where to apply the policy. Only devices in the selected device groups will be prevented from accessing websites in the selected categories.
+5. Review the summary and save the policy. The policy may take up to 15 minutes to apply to your selected devices.
 
 >[!NOTE]
->If you are removing a policy or changing machine groups at the same time, this might cause a delay in policy deployment.
+>If you are removing a policy or changing device groups at the same time, this might cause a delay in policy deployment.
 
 ## Web content filtering cards and details
 
@@ -142,7 +142,7 @@ This card displays the total number of requests for web content in all URLs.
 
 ### View card details
 
-You can access the **Report details** for each card by selecting a table row or colored bar from the chart in the card. The report details page for each card contains extensive statistical data about web content categories, website domains, and machine groups.
+You can access the **Report details** for each card by selecting a table row or colored bar from the chart in the card. The report details page for each card contains extensive statistical data about web content categories, website domains, and device groups.
 
 ![Image of web protection report details](images/web-protection-report-details.png)
 
@@ -150,7 +150,7 @@ You can access the **Report details** for each card by selecting a table row or
 
 - **Domains**: Lists the web domains that have been accessed or blocked in your organization. Select a specific domain to view detailed information about that domain.
 
-- **Machine groups**: Lists all the machine groups that have generated web activity in your organization
+- **Device groups**: Lists all the device groups that have generated web activity in your organization
 
 Use the time range filter at the top left of the page to select a time period. You can also filter the information or customize the columns. Select a row to open a flyout pane with even more information about the selected item.
 
@@ -162,7 +162,7 @@ You need to be logged in to an AAD account with either App administrator or Glob
 
 ### Limitations and known issues in this preview
 
-- Unassigned machines will have incorrect data shown within the report. In the Report details > Machine groups pivot, you may see a row with a blank Machine Group field. This group contains your unassigned machines in the interim before they get put into your specified group. The report for this row may not contain an accurate count of machines or access counts.
+- Unassigned devices will have incorrect data shown within the report. In the Report details > Device groups pivot, you may see a row with a blank Device Group field. This group contains your unassigned devices in the interim before they get put into your specified group. The report for this row may not contain an accurate count of devices or access counts.
 
 - The data in our reports may not be congruent with other data on the site. We currently do not support real-time data processing for this feature, so you may see inconsistencies between the data in our reports and the URL entity page.