diff --git a/README.md b/README.md
index 0f52305a..54ecfca5 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+A PHP Wrapper for use with the [TMDB API](http://http://docs.themoviedb.apiary.io/).
+==============
+
+Based on & inspired by [php-github-api](https://github.com/KnpLabs/php-github-api) and [php-gitlab-api](https://github.com/m4tthumphrey/php-gitlab-api/).
+
 Work in progress
 ----------------
 
@@ -5,15 +10,6 @@ I've started working on this since the week of October-November 2013. I hope to
 
 The API namespace has most things already covered, however this is RAW output from the API. I'm working extensively on finishing the models.
 
-A PHP Wrapper for use with the [TMDB API](http://http://docs.themoviedb.apiary.io/).
-<<<<<<< HEAD
-------------
-=======
-==============
->>>>>>> bcd72746aaa5e561be08385c5395604a7f970ae7
-
-Based on & inspired by [php-github-api](https://github.com/KnpLabs/php-github-api) and [php-gitlab-api](https://github.com/m4tthumphrey/php-gitlab-api/).
-
 Installation
 ------------
 Install Composer