fixed merge conflict

Author: mikeblome

.openpublishing.redirection.json

@@ -745,6 +745,76 @@
       "redirect_url": "/cpp/cpp/cpp-language-reference",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/cpp/using-wmain-instead-of-main.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/main-program-startup.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/main-function-restrictions.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/additional-startup-considerations.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/wildcard-expansion.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/parsing-cpp-command-line-arguments.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/customizing-cpp-command-line-processing.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/startup-and-termination-cpp.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/argument-definitions.md",
+      "redirect_url": "/cpp/cpp/main-function-command-line-args",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/exit-function.md",
+      "redirect_url": "/cpp/cpp/program-termination",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/abort-function.md",
+      "redirect_url": "/cpp/cpp/program-termination",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/return-statement-in-program-termination-cpp.md",
+      "redirect_url": "/cpp/cpp/program-termination",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/using-exit-or-return.md",
+      "redirect_url": "/cpp/cpp/program-termination",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "docs/cpp/using-atexit.md",
+      "redirect_url": "/cpp/cpp/program-termination",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/cpp/tokens-cpp.md",
       "redirect_url": "/cpp/cpp/character-sets",