Resolving merge conflicts

Author: jabbacakes

docusaurus.config.js

@@ -396,10 +396,6 @@ module.exports = {
             label: "1.0.0",
             path: "1.0.0",
           },
-          "1.0.0": {
-            label: "1.0.0",
-            path: "1.0.0",
-          },
           "0.6.0": {
             label: "0.6.0",
             path: "0.6.0",

mppm_versioned_docs/version-1.1.0/sync-play-mode.md

@@ -12,6 +12,7 @@ Multiplayer Play Mode syncs the main Editor Player and [Virtual Players](../virt
 | **Pause** | Pauses all activated Players (main Editor Player and Virtual Players) |
 | **Step** | Performs a single-frame step for all activated Players (main Editor Player and Virtual Players) |
 
+
 You can change the layout of the **Multiplayer Play Mode** window with the **Layout** dropdown. To learn more, refer to [Change the layout of a Virtual Player](virtual-players-layout).
 
 :::note

mppm_versions.json

@@ -1,4 +1,5 @@
 [
+  "1.2.0",
   "current",
   "1.2.0",
   "1.1.0",

sidebars.js

@@ -123,26 +123,21 @@ module.exports = {
             "type": "category",
             "label": "Networking components",
             "items": [
-              {
-                "collapsed": true,
-                "type": "category",
-                "label": "NetworkObject",
-                "items": [
-                    {
-                        "type": "doc",
-                        "id": "basics/networkobject"
-                    },
-                    {
-                        "type": "doc",
-                        "id": "basics/playerobjects"
-                    },
-                    {
-                        "type": "doc",
-                        "id": "advanced-topics/networkobject-parenting"
-                    },
-
-                  ]
-              },
+                {
+                  "collapsed": true,
+                  "type": "category",
+                  "label": "NetworkObject",
+                  "items": [
+                      {
+                          "type": "doc",
+                          "id": "basics/networkobject"
+                      },
+                      {
+                          "type": "doc",
+                          "id": "advanced-topics/networkobject-parenting"
+                      },
+                    ]
+                },
                 {
                   "collapsed": true,
                   "type": "category",
@@ -580,7 +575,7 @@ module.exports = {
                             "id": "learn/bitesize/bitesize-invaders"
                         },
                     ]
-                },                
+                },
             ],
         },
         {