Removes merge artifacts in README

Author: philnash

Diff for: README.md

@@ -4,25 +4,17 @@ This is a [Devise](https://github.com/plataformatec/devise) extension to add Two
 
 ## Pre-requisites
 
-<<<<<<< HEAD
 To use the Authy API you will need a Twilio Account, [sign up for a free account here](https://www.twilio.com/try-twilio).
 
 Create an [Authy Application in the Twilio console](https://www.twilio.com/console/authy/applications) and take note of the API key.
-=======
-[Sign up for Twilio account](https://www.twilio.com/try-twilio) and [get an Authy API Key from the console](https://www.twilio.com/console/authy).
->>>>>>> Updates README with new demo app
 
 ## Demo
 
 See [this repo for a full demo of using `authy-devise`](https://github.com/twilio/authy-devise-demo).
 
 ## Getting started
 
-<<<<<<< HEAD
 First get your Authy API key from [the Twilio console](https://www.twilio.com/console/authy/applications). We recommend you store your API key as an environment variable.
-=======
-First get your Authy API key from [the Twilio console](https://www.twilio.com/console/authy). We recommend you store your API key as an environment variable.
->>>>>>> Updates README with new demo app
 
 ```bash
 $ export AUTHY_API_KEY=YOUR_AUTHY_API_KEY