diff --git a/OPTIONS.md b/OPTIONS.md
index 1df9e79f230..ad5e4473f34 100644
--- a/OPTIONS.md
+++ b/OPTIONS.md
@@ -9,11 +9,7 @@ Options:
   --config-name <value...>                                                           Name of the configuration to use.
   -m, --merge                                                                        Merge two or more configurations using 'webpack-merge'.
   --env <value...>                                                                   Environment passed to the configuration when it is a function.
-<<<<<<< HEAD
-  --node-env <value>                                                                 Sets process.env.NODE_ENV to the specified value
-=======
   --node-env <value>                                                                 Sets process.env.NODE_ENV to the specified value.
->>>>>>> feat: show '--node-env' in minimum help output
   -h, --hot                                                                          Enables Hot Module Replacement
   --no-hot                                                                           Disables Hot Module Replacement.
   --analyze                                                                          It invokes webpack-bundle-analyzer plugin to get bundle information.