A few small edits

Author: lwasser

package-structure-code/intro.md

@@ -98,8 +98,6 @@ Complex Builds <complex-python-package-builds>
 :hidden:
 :caption: Publishing a package
 
-Intro <self>
-
 Package versions <python-package-versions>
 Code style <code-style-linting-format>
 Publish <publish-python-package-pypi-conda.md>

package-structure-code/publish-python-package-pypi-conda.md

@@ -157,8 +157,7 @@ by the conda-forge maintainer team.](https://conda-forge.org/docs/maintainer/add
 Generally those steps are:
 
 1. Fork the staged recipes conda-forge GitHub repository
-   <<<<<<< HEAD
-1. Create a new recipe using the `grayskull` tool
+1. Create a new recipe using the `grayskull` tool. You can [learn more about grayskull here](https://conda.github.io/grayskull/).
 1. Add the recipe file created by `grayskull` in a folder within the recipes/ directory of the [**conda-forge/staged-recipes**](https://github.com/conda-forge/staged-recipes) repository.
 1. Create a new recipe using the `grayskull` tool
 1. Add the recipe file created by `grayskull` in a folder within the recipes/ directory of the [**conda-forge/staged-recipes**](https://github.com/conda-forge/staged-recipes) repository.