diff --git a/laravel/documentation/changes.md b/laravel/documentation/changes.md
index 4bfd18f0..fbedc4ab 100644
--- a/laravel/documentation/changes.md
+++ b/laravel/documentation/changes.md
@@ -2,13 +2,10 @@ # Laravel Change Log
 
 ## Contents
 
-<<<<<<< HEAD:laravel/documentation/changes.md
 - [Laravel 3.2](#3.2)
 - [Upgrading From 3.1](#upgrade-3.2)
-=======
 - [Laravel 3.1.9](#3.1.9)
 - [Upgrading From 3.1.8](#upgrade-3.1.9)
->>>>>>> master:changes.md
 - [Laravel 3.1.8](#3.1.8)
 - [Upgrading From 3.1.7](#upgrade-3.1.8)
 - [Laravel 3.1.7](#3.1.7)