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

@@ -80,14 +80,10 @@
 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
 ----------------