Update README.md

Author: chenasraf

README.md

@@ -13,10 +13,7 @@ Yes, there are a lot of arg parsers. But hear us out.
 - Options with flexible parsing
 - Required options
 - Options with multiple values
-  <<<<<<< Updated upstream
-  =======
 - Nameless options (TBD)
-  > > > > > > > Stashed changes
 - Automatically generated help text:
   - Customizable colors
   - Customizable header and footer text