diff --git a/README.md b/README.md
index 17e88ff..0800919 100644
--- a/README.md
+++ b/README.md
@@ -28,14 +28,10 @@
 __the example .env is__
 ```
 WEBHOOK_URL=<webhook_url>
-<<<<<<< HEAD
 WEBHOOK_NAME=Auction_Notifier
 WEBHOOK_PROFILE_PICTURE=<picture_url>
-=======
-WEBHOOK_NAME=Flipper
-WEBHOOK_PROFILE_PICTURE=https://cdn.discordapp.com/avatars/486155512568741900/164084b936b4461fe9505398f7383a0e.png?size=4096
->>>>>>> aad843d (uppercased environment variables)
 ```
+
 You can also add these as environment variables into your system when running Node or run the app via `node --env-file=.env index.js`
 
 ## config.json