README.md in factory_bot-1.0.0.alpha vs README.md in factory_bot-1.0.1.alpha

@@ -80,17 +80,21 @@
 community](https://github.com/thoughtbot/factory_bot/graphs/contributors).
 
 License
 -------
 
+<<<<<<< HEAD
+factory_girl is Copyright © 2008-2017 Joe Ferris and thoughtbot. It is free
+=======
 factory_bot is Copyright © 2008-2016 Joe Ferris and thoughtbot. It is free
+>>>>>>> Replace 'girl' with 'bot' everywhere
 software, and may be redistributed under the terms specified in the
 [LICENSE](/LICENSE) file.
 
 About thoughtbot
 ----------------
 
-![thoughtbot](https://thoughtbot.com/logo.png)
+![thoughtbot](http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg)
 
 factory_bot is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
 We love open source software!