Update README.md

Author: JMKelley

README.md

@@ -16,11 +16,7 @@ To install the plugin, follow these instructions.
 
 2. Then tell Composer to load the plugin:
 
-<<<<<<< HEAD
         composer require jmkelley/dumptruck
-=======
-        composer require dumptruck/delete-entries
->>>>>>> d71f66b195411b04507c9de9f6d8471cb18e0f5f
 
 3. In the Control Panel, go to Settings → Plugins and click the “Install” button for Delete Entries.
 
@@ -39,4 +35,4 @@ The process of deleting exprired entried can be scheduled with Craft Job by runn
 php craft dump-truck/dump/entries
 ```
 
-Brought to you by [Jonathan Kelley](http://www.vouchertoday.uk/)
+Brought to you by [Jonathan Kelley](http://www.vouchertoday.uk/)