Fixing README

README.md

@@ -1,19 +1,15 @@
+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
 ----------------
 
 I've started working on this since the week of October-November 2013. I hope to finish this within a week or two, if you feel like lending a hand please contribute, wether it's documentation or code they are both more than welcome!
 
 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