resolve conflicts from main branch

content/contributing/collaborating-on-github-docs/label-reference.md

@@ -10,8 +10,8 @@ You can use labels to locate a particular type of issue. For example, click the
 
 | Label | Description |
 | --- | --- |
-| [`help wanted`](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) | Problems or updates that anyone in the community can start working on. | 
-| [`good first issue`](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) | Problems or updates we think are ideal for beginners. | 
-| [`content`](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3Acontent) | Problems or updates in the content on docs.github.com. These will usually require some knowledge of Markdown. | 
-| [`engineering`](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3Aengineering) | Problems or updates involving the functionality of the docs.github.com website. Fixing these issues will usually require some knowledge of JavaScript/Node.js or YAML. | 
-| [`codespaces`](https://github.com/github/docs/labels/codespaces)<br> [`desktop`](https://github.com/github/docs/labels/desktop)<br> [`graphql`](https://github.com/github/docs/labels/graphql) | Labels for filtering issues by a product or documentation area. | 
+| [`help wanted`](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) | Problems or updates that anyone in the community can start working on. |
+| [`good first issue`](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) | Problems or updates we think are ideal for beginners. |
+| [`content`](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3Acontent) | Problems or updates in the content on docs.github.com. These will usually require some knowledge of Markdown. |
+| [`engineering`](https://github.com/github/docs/issues?q=is%3Aopen+is%3Aissue+label%3Aengineering) | Problems or updates involving the functionality of the docs.github.com website. Fixing these issues will usually require some knowledge of JavaScript/Node.js or YAML. |
+| [`codespaces`](https://github.com/github/docs/labels/codespaces)<br> [`desktop`](https://github.com/github/docs/labels/desktop)<br> [`graphql`](https://github.com/github/docs/labels/graphql) | Labels for filtering issues by a product or documentation area. |

content/contributing/collaborating-on-github-docs/self-review-checklist.md

@@ -9,9 +9,9 @@ versions:
 Before you submit your changes to the {% data variables.product.prodname_docs %} team for review, work through the list below to complete your self review.
 
 - If there is a content design plan, confirm that your changes meet the user experience and goals outlined in the plan.
-- After opening your pull request, view your changes on staging to confirm the article renders as expected and matches the source. This helps spot issues like typos, content that doesn't follow the style guide, or content that isn't rendering due to versioning problems. 
+- After opening your pull request, view your changes on staging to confirm the article renders as expected and matches the source. This helps spot issues like typos, content that doesn't follow the style guide, or content that isn't rendering due to versioning problems.
 - Review your changes for technical accuracy.
 - Review your entire pull request to ensure it follows our guidance on creating content that can be translated. For more information, see "[AUTOTITLE](/contributing/writing-for-github-docs/writing-content-to-be-translated)."
 - Check your changes for grammar, spelling, and adherence to the style guide. For more information, see "[AUTOTITLE](/contributing/writing-for-github-docs/style-guide)."
-- If you have added new versioning or made changes to existing versioning, confirm your changes render as expected while viewing each available version of the article. 
-- If there are any failing checks in your pull request, troubleshoot them until they're all passing.
+- If you have added new versioning or made changes to existing versioning, confirm your changes render as expected while viewing each available version of the article.
+- If there are any failing checks in your pull request, troubleshoot them until they're all passing.

content/contributing/collaborating-on-github-docs/using-git-on-github-docs.md

@@ -46,7 +46,7 @@ To keep your local branches in sync with their remotes and avoid merge conflicts
 
      ``` <!-- markdownlint-disable-line fenced-code-language -->
      git checkout -b my-username/new-codespace-policy
-     ```     
+     ```
 
      {% endnote %}
 
@@ -107,7 +107,7 @@ To keep your local branches in sync with their remotes and avoid merge conflicts
    ```
 
    This commits the staged changes locally. You can now push this commit, and any other unpushed commits, to the remote repository.  
-   
+
    To remove this commit, use `git reset --soft HEAD~1`. After running this command our changes are no longer committed but the changed files remain in the staging area. You can make further changes and then `add` and `commit` again.
 
 1. Push your changes to the remote repository on {% data variables.product.prodname_dotcom_the_website %}.
@@ -128,7 +128,7 @@ To keep your local branches in sync with their remotes and avoid merge conflicts
 
 - Favor commits that contain small, focused groups of changes over commits with large, unfocused groups of changes, since this will help you write commit messages that other people can easily understand. An exception is the initial commit for a new project or category. These commits are sometimes large, as they often introduce the bare versions of many articles at once to provide an organizational scheme for subsequent work.
 - If you are incorporating feedback or want to address a set of changes to a particular person or team for review, @mention the person whose suggestions you are incorporating. For example: "Incorporating feedback from @octocat," or "Updating billing configuration steps - cc @monalisa for accuracy."
-- If a commit addresses an issue, you can reference the issue number in the commit, and a link to the commit will appear in the issue conversation timeline: "Addresses #1234 - adds steps for backing up the VM before upgrading." 
+- If a commit addresses an issue, you can reference the issue number in the commit, and a link to the commit will appear in the issue conversation timeline: "Addresses #1234 - adds steps for backing up the VM before upgrading."
   {% note %}
 
   **Note**: We generally don't close an issue via a commit. To close an issue, open a pull request and add "Closes #1234" to the description. The linked issue will be closed when the pull request is merged. For more information, see "[AUTOTITLE](/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)."