Merge pull request #4780 from github/ahpook/update-conflict-text

Simplify and clarify the conflict of interest text

Author: ahpook

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 ### Please confirm this pull request meets the following requirements:
 
 - [ ] I followed the contributing guidelines: <https://github.com/github/explore/blob/main/CONTRIBUTING.md>.
-- [ ] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.
+- [ ] This change is not self-promotion.
 
 ### Which change are you proposing?
 

.github/workflows/conflict.yml

@@ -14,12 +14,12 @@ jobs:
       - run: |
           echo "In order to review this pull request for acceptance, we need to make sure that all of the prerequisites are satisfied."
           echo "This was not checked:"
-          echo "> I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding."
-          echo "This is a requirement to maintain a high level of independence in this project. Please update if you are able to verify that you meet that requirement."
+          echo "> This change is not self-promotion.
+          echo "This is a requirement to maintain a high level of independence in this project. Please update to confirm there is no conflict of interest."
           echo "Thank you!"
           exit 1
-        if: contains(github.event.pull_request.body, '- [ ] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.')
+        if: contains(github.event.pull_request.body, '- [ ] This change is not self-promotion.')
         name: Fail
       - run: exit 0
-        if: contains(github.event.pull_request.body, '- [x] I am not the sole author or employee of a company who created either the topic I am modifying/adding or the collection entry I am modifying/adding.')
+        if: contains(github.event.pull_request.body, '- [x] This change is not self-promotion.')
         name: Succeed