diff --git a/server_admin/topics/overview.adoc b/server_admin/topics/overview.adoc
index 4acc0e959a..3d8914c27b 100644
--- a/server_admin/topics/overview.adoc
+++ b/server_admin/topics/overview.adoc
@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 == {project_name} features and concepts
 =======
 == Features and Concepts for {project_name}
 >>>>>>> Rework server initialization chapter
+=======
+== {project_name} features and concepts
+>>>>>>> Reworked chapter 1, the overview chapter
 
 {project_name} is a single sign on solution for web apps and RESTful web services.  The goal of {project_name}
 is to make security simple so that it is easy for application developers to secure the apps and services they have deployed