diff --git a/README.md b/README.md
index 27576fd..5dba5ec 100644
--- a/README.md
+++ b/README.md
@@ -42,12 +42,8 @@ First copy the file pfsense_zbx.php to your pfsense box (e.g. to /root/scripts).
 From **Diagnostics/Command Prompt** input this one-liner:
 
 ```bash
-<<<<<<< HEAD
 mkdir /root/zabbix
-curl -o /root/zabbix/pfsense_zbx.php https://git.fws.fr/fws/pfsense-zabbix/raw/branch/master/pfsense_zbx.php
-=======
 curl --create-dirs -o /root/scripts/pfsense_zbx.php https://raw.githubusercontent.com/rbicelli/pfsense-zabbix-template/master/pfsense_zbx.php
->>>>>>> upstream/master
 ```
 
 Then, setup the system version cronjob with: 
@@ -70,11 +66,7 @@ UserParameter=pfsense.discovery[*],/usr/local/bin/sudo /usr/local/bin/php /root/
 UserParameter=pfsense.value[*],/usr/local/bin/sudo /usr/local/bin/php /root/zabbix/pfsense_zbx.php $1 $2 $3
 ```
 
-<<<<<<< HEAD
 _You need to allow zabbix user to exec /usr/local/bin/sudo /usr/local/bin/php /root/zabbix* without password with sudo_
-=======
-_Please note that **AllowRoot=1** option is required in order to correctly execute OpenVPN checks and others._
->>>>>>> upstream/master
 
 Also increase the **Timeout** value at least to **5**, otherwise some checks will fail.