Resolving merge conflicts

docs/learn/bitesize/bitesize-usecases.md

@@ -31,7 +31,7 @@ The ProximityChecks scene shows you how to detect the local user and enable or d
 
 ## The RPCs scene
 
-The RPCs scene semonstrates the following Remote Procedure Call (RPC) processes: 
+The RPCs scene demonstrates the following Remote Procedure Call (RPC) processes: 
  * Use RPCs to send information from clients to the server.
  * Perform server-side manipulation of the data sent.
  * Use connection approval to determine the spawn position of the player.
@@ -40,4 +40,4 @@ The RPCs scene semonstrates the following Remote Procedure Call (RPC) processes:
 
 - Get help and ask questions on [Multiplayer Discussions](https://discussions.unity.com/lists/multiplayer).
 - Join the community of Multiplayer creators on the [Multiplayer Networking Discord](https://discord.gg/unity-multiplayer-network).
-- [Request a feature or report a bug](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/issues/new/choose).
+- [Request a feature or report a bug](https://github.com/Unity-Technologies/com.unity.multiplayer.samples.bitesize/issues/new/choose).

mppm/about.md

@@ -8,7 +8,7 @@ Use Multiplayer Play Mode to test multiplayer functionality within the Unity Edi
 
 ## Compatibility
 
-Multiplayer Play Mode version 1.1.0 is compatible with Unity Editor versions 6000.0.22f1 or later.
+Multiplayer Play Mode version 1.3.0 is compatible with Unity Editor versions 6000.0.22f1 or later.
 
 ## Multiplayer Play Mode terminology
 
@@ -27,7 +27,7 @@ Multiplayer Play Mode has some inherent technical limitations, specifically arou
 The Unity Editor and Virtual Players require a lot of system resources, so you shouldn't use Multiplayer Play Mode at scale. Multiplayer Play Mode is designed for small-scale, local testing environments that can only support up to four total Players (the main Editor Player and three Virtual Players).
 
 ### Authoring
-You can't create or change the properties of GameObjects in a Virtual Player. Instead, use the main Editor Player to make changes and a Virtual Player to test multiplayer functionality. Any changes you make in Play Mode in the main Editor Player reset when you exit Play Mode. 
+You can't create or change the properties of GameObjects in a Virtual Player. Instead, use the main Editor Player to make changes and a Virtual Player to test multiplayer functionality. Any changes you make in Play Mode in the main Editor Player reset when you exit Play Mode.
 :::note
 You can't access any main Editor Player functionality from Virtual Players.
 :::