diff --git a/Program.cs b/Program.cs
index 5a5b174..49bf5d1 100644
--- a/Program.cs
+++ b/Program.cs
@@ -22,7 +22,11 @@ namespace SharpScan
         [Option('p', "ports", Required = false, Separator = ',', HelpText = "TCP port to scan, coma separated")]
         public IEnumerable<string> Ports { get; set; }
 
+<<<<<<< HEAD
         [Option('t', "timeout", Required = false, Default = 50, HelpText = "Timeout in milliseconds to check a port")]
+=======
+        [Option('t', "timeout", Required = false, Default = 100, HelpText = "Timeout in milliseconds to check a port")]
+>>>>>>> 7b1f2f3d9b6b72a7494eccbf5415b94a9ea5235e
         public int Timeout { get; set; }
 
         [Option('d', "delay", Required = false, Default = 0, HelpText = "Delay in milliseconds between 2 scan request")]
diff --git a/README.md b/README.md
index f1855d9..b23741b 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Copyright ©  2025
 
   -p, --ports        TCP port to scan, coma separated
 
-  -t, --timeout      (Default: 500) Timeout in milliseconds to check a port
+  -t, --timeout      (Default: 100) Timeout in milliseconds to check a port
 
   -d, --delay        (Default: 0) Delay in milliseconds between 2 scan request