diff --git a/modules/system-administrators-guide/pages/_partials/servers/The_Apache_HTTP_Server.adoc b/modules/system-administrators-guide/pages/_partials/servers/The_Apache_HTTP_Server.adoc
index f051d86..c07dfd7 100644
--- a/modules/system-administrators-guide/pages/_partials/servers/The_Apache_HTTP_Server.adoc
+++ b/modules/system-administrators-guide/pages/_partials/servers/The_Apache_HTTP_Server.adoc
@@ -2,6 +2,7 @@
 [[s1-The_Apache_HTTP_Server]]
 == The Apache HTTP Server
 indexterm:[httpd,Apache HTTP Server]
+<<<<<<< HEAD
 The web server available in {MAJOROS} is the Apache HTTP server daemon, `httpd`, an open source web server developed by the link:++https://www.apache.org/++[Apache Software Foundation]. In Fedora 19 the Apache server was updated to [application]*Apache HTTP Server 2.4*. This section describes the basic configuration of the `httpd` service, and covers some advanced topics such as adding server modules, setting up virtual hosts, or configuring the secure HTTP server.
 
 There are important differences between the Apache HTTP Server 2.4 and version 2.2, and if you are upgrading from a release prior to Fedora 19, you will need to update the `httpd` service configuration accordingly. This section reviews some of the newly added features, outlines important changes, and guides you through the update of older configuration files.
@@ -116,6 +117,9 @@ Syntax OK
 ----
 
 For more information on upgrading the Apache HTTP Server configuration from version 2.2 to 2.4, see link:++https://httpd.apache.org/docs/2.4/upgrading.html++[].
+=======
+The web server available in {MAJOROS} is the Apache HTTP server daemon, `httpd`, an open source web server developed by the link:++https://www.apache.org/++[Apache Software Foundation]. This section describes the basic configuration of the `httpd` service, and covers some advanced topics such as adding server modules, setting up virtual hosts, or configuring the secure HTTP server.
+>>>>>>> 1cea858... Issue 23 - remove old references to F19 and a useless changelog from httpd section
 
 [[s2-apache-running]]
 === Running the httpd Service