Fix conflict

README.md

@@ -29,12 +29,8 @@ The following 3rd party libraries and resources are the reason this app works. R
 - RxAndroid (https://github.com/ReactiveX/RxAndroid)
 - Butter Knife (http://jakewharton.github.io/butterknife/)
 - Timber (https://github.com/JakeWharton/timber)
-<<<<<<< HEAD
-- Gson (https://github.com/google/gson)
-=======
 - LoganSquare (https://github.com/bluelinelabs/LoganSquare)
 - retrofit-logansquare (https://github.com/aurae/retrofit-logansquare)
->>>>>>> develop
 - Joda Time Android (https://github.com/dlew/joda-time-android)
 - Parceler (https://github.com/johncarl81/parceler)
 - Bypasses (https://github.com/Commit451/bypasses)