Fix README.md

README.md

@@ -78,9 +78,6 @@ client with --token yourapitoken --dump
 . </b>However, you need install python requests library (http://docs.python-requests.org/en/master/user/install/#install).
 In addition, to establish secure link, you will also need SSL trusted CA chain file.  
 
-<<<<<<< Updated upstream
-<b> Note: we also enclose the trusted CA file within the client: chain_TERENA_SSL_CA_3.pem.</b>
-=======
 <b> Note: we also enclose the trusted CA file within the client: chain_TERENA_SSL_CA_3.pem.</b>
 
 ---