diff --git a/README.md b/README.md
index 6b02aa6..8328f3c 100644
--- a/README.md
+++ b/README.md
@@ -230,11 +230,7 @@ If you're still in your console however, you can go even faster by using **vlc i
 ## Command line options
 
 * **"-c"** : Set a custom path to the configuration file (-c /path/to/conf)
-<<<<<<< HEAD
-* **"-s"** : Set custom subnets (overrides configuration) : You can use this argument in many ways, using a subnet (e.g.: `172.16.100.0/24`) or even an IP (e.g.: `172.16.100.10`), a range of IPs (e.g.: `172.16.100.10-172.16.100.20`) or a mix of all those (e.g.: `172.17.100.0/24,172.16.100.10-172.16.100.20,0.0.0.0`).
-=======
-* **"-s"** : Set custom target (overrides configuration)
->>>>>>> 5489969... v2.0.0: Rename subnet to target to avoid confusion
+* **"-s"** : Set custom target (overrides configuration) : You can use this argument in many ways, using a subnet (e.g.: `172.16.100.0/24`) or even an IP (e.g.: `172.16.100.10`), a range of IPs (e.g.: `172.16.100.10-172.16.100.20`) or a mix of all those (e.g.: `172.17.100.0/24,172.16.100.10-172.16.100.20,0.0.0.0`)
 * **"-p"** : Set custom ports (overrides configuration)
 * **"-m"** : Set number of threads (*Default value : 1*)
 * **"-l"** : Set log level