fixing merge conflicts.

changes.md

@@ -4,6 +4,8 @@
 
 - [Laravel 3.2](#3.2)
 - [Upgrading From 3.1](#upgrade-3.2)
+- [Laravel 3.1.4](#3.1.4)
+- [Upgrading From 3.1.3](#upgrade-3.1.4)
 - [Laravel 3.1.3](#3.1.3)
 - [Upgrading From 3.1.2](#uprade-3.1.3)
 - [Laravel 3.1.2](#3.1.2)
@@ -13,7 +15,6 @@
 - [Laravel 3.1](#3.1)
 - [Upgrading From 3.0](#upgrade-3.1)
 
-<<<<<<< HEAD
 <a name="3.2"></a>
 ## Laravel 3.2
 
@@ -29,6 +30,17 @@
 - Replace the **laravel** folder.
 - Add new **vendors** folder.
 
+<a name="3.1.4"></a>
+## Laravel 3.1.4
+
+- Fixes Response header casing bug.
+- Fixes SQL "where in" (...) short-cut bug.
+
+<a name="upgrade-3.1.4"></a>
+## Upgrading From 3.1.3
+
+- Replace the **laravel** folder.
+
 <a name="3.1.3"></a>
 ## Laravel 3.1.3