Update README.md

Author: adn77

README.md

@@ -15,18 +15,12 @@ Usage: cli [options]
 Options:
   -q, --quiet                                     Non-interactive, output refresh_token on StdOut and exit
   -d, --debug                                     Turn on debug output to StdOut
-<<<<<<< HEAD
   -A, --deviceAppName <AppName>                   optional: Name of the Device registered with the Alexa app (default: alexa_cookie_cli)
-=======
->>>>>>> fbbedcf1d9a6e63a0636e95de27e50f3846fbb30
   -p, --amazonPage <page>                         optional: possible to use with different countries, default is "amazon.de"
   -b, --baseAmazonPage <amazon.com|amazon.co.jp>  optional: Change the Proxy Amazon Page - all "western countries" directly use amazon.com! Change to amazon.co.jp for Japan
   -a, --amazonPageProxyLanguage <lang>            optional: language to be used for the Amazon Sign-in page the proxy calls. default is "de_DE"
   -L, --acceptLanguage <lang>                     optional: webpage language, should match to amazon-Page, default is "de-DE"
-<<<<<<< HEAD
-=======
   -u, --userAgent <Browser>                       optional: own userAgent to use for all request, overwrites default one, should not be needed
->>>>>>> fbbedcf1d9a6e63a0636e95de27e50f3846fbb30
   -H, --proxyOwnIp <IP of localhost>              provide own IP(!) to later access the proxy. needed to setup all rewriting and proxy stuff internally (default: "127.0.0.1")
   -P, --proxyPort <port>                          optional: use this port for the proxy, default is 8080 (default: 8080)
   -B, --proxyListenBind <IP>                      optional: set this to bind the proxy to a special IP, default is "0.0.0.0"