diff --git a/content/rancher/v2.x/en/concepts/resources/_index.md b/content/rancher/v2.x/en/concepts/resources/_index.md
index e43ebac1f7f..70411d7e264 100644
--- a/content/rancher/v2.x/en/concepts/resources/_index.md
+++ b/content/rancher/v2.x/en/concepts/resources/_index.md
@@ -10,7 +10,7 @@ Within the context of a Rancher project or namespace, _resources_ are files and
 - [Secrets](#secrets)
 - [Registries](#registries)
 
-Rancher extends the application of the Kubernetes namespace resources listed above to [projects]({{< baseurl >}}/rancher/v2.x/en/projects), which are Rancher-specific constructs. In the hierarchy of Rancher objects, projects contain namespaces. Therefore, any resources available within a project are available for all namespaces within that project.
+Rancher extends the application of the Kubernetes namespace resources listed above to [projects]({{< baseurl >}}/rancher/v2.x/en/concepts/projects/), which are Rancher-specific constructs. In the hierarchy of Rancher objects, projects contain namespaces. Therefore, any resources available within a project are available for all namespaces within that project.
 
 Within Kubernetes, certificates, registries, and secrets are all considered [secrets](https://kubernetes.io/docs/concepts/configuration/secret/). Therefore, within a single project or namespace, these resources must have unique names to avoid conflicts. Although secrets are primarily used to carry sensitive information, they have other uses as well. Read on below.
 
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md b/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md
index b9aa4cb7951..dbfba4ffe81 100644
--- a/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md
+++ b/content/rancher/v2.x/en/installation/ha-server-install-external-lb/nginx/_index.md
@@ -12,12 +12,7 @@ For help installing NGINX, refer to their [install documentation](https://www.ng
 
 After installing NGINX, you need to create the NGINX config file, `/etc/nginx/conf.d/rancher.conf`, with the IP addresses for your Linux nodes, chosen FQDN and location of the certificate file and certificate key file.
 
-<<<<<<< HEAD
->**Note:** The configuration example in this procedure includes the minimum configurations needed to use
-to use Nginx as a Layer 7 load balancer with Rancher. For full documentation on all Nginx Layer 7 configuration options available, see the [Nginx HTTP Load Balancer Documentation](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/).
-=======
 >**Note:** The example configuration below does not include all available Nginx options and may not be suitable for your production environment. For full configuration documentation, see [NGINX Load Balancing - HTTP Load Balancer](https://docs.nginx.com/nginx/admin-guide/load-balancer/http-load-balancer/).
->>>>>>> nginx references
 
 1. Copy and paste the code sample below into your favorite text editor. Save it as `/etc/nginx/conf.d/rancher.conf`.