Merge pull request #26267 from github/repo-sync

Repo sync

content/site-policy/privacy-policies/github-copilot-for-business-privacy-statement.md

@@ -15,19 +15,12 @@ Use of GitHub Copilot for Business is also subject to the [GitHub Privacy Statem
 
 Copilot for Business relies on file content and additional data to work. It collects data to provide the service, some of which is then saved for further analysis and product improvements. Copilot for Business collects data as described below:
 
-<<<<<<< HEAD
-## User Engagement Data 
-
-When you use Copilot for Business it will collect usage information about events generated when interacting with the IDE or editor. These events include user edit actions like completions accepted and dismissed, and error and general usage data to identify metrics like latency and features engagement. This information may include personal data, such as pseudonymous identifiers.
-
-## Code Snippets Data 
-
-=======
 ## User Engagement Data
+
 When you use Copilot for Business it will collect usage information about events generated when interacting with the IDE or editor. These events include user edit actions like completions accepted and dismissed, and error and general usage data to identify metrics like latency and features engagement. This information may include personal data, such as pseudonymous identifiers.
 
 ## Code Snippets Data
->>>>>>> main
+
 GitHub Copilot transmits snippets of your code from your IDE to GitHub to provide Suggestions to you. Code snippets data is only transmitted in real-time to return Suggestions, and is discarded once a Suggestion is returned. Copilot for Business does not retain any Code Snippets Data.
 
 ## How is data in Copilot for Business used and shared?
@@ -41,11 +34,7 @@ Such uses may include:
 - Conducting experiments and research related to developers and their use of developer tools and services.
 
 ## How can users of Copilot for Business control use of their data?
-<<<<<<< HEAD
 
-User engagement data (which includes pseudonymous identifiers and general usage data), is required for the use of GitHub Copilot and will continue to be collected, processed, and shared with Microsoft when you use GitHub Copilot. 
-=======
 User engagement data (which includes pseudonymous identifiers and general usage data), is required for the use of GitHub Copilot and will continue to be collected, processed, and shared with Microsoft when you use GitHub Copilot.
->>>>>>> main
 
 For more information on how GitHub processes and uses personal data, please see the [GitHub Privacy Statement](/site-policy/privacy-policies/github-privacy-statement).