diff --git a/laravel/documentation/install.md b/laravel/documentation/install.md
index a3e9bd8e..ae3984dd 100644
--- a/laravel/documentation/install.md
+++ b/laravel/documentation/install.md
@@ -4,11 +4,7 @@ ## Contents
 
 - [Requirements](#requirements)
 - [Installation](#installation)
-<<<<<<< HEAD
-- [Server Configuration: Why Public?](#server-configuration)
-=======
 - [Server Configuration](#server-configuration)
->>>>>>> feature/docs-install
 - [Basic Configuration](#basic-configuration)
 - [Environments](#environments)
 - [Cleaner URLs](#cleaner-urls)