resolve conflicts

Author: Minnie Liu

articles/communication-services/concepts/voice-video-calling/calling-sdk-features.md

@@ -44,11 +44,7 @@ The following list presents the set of features that are currently available in
 |                   | Invite another VoIP participant to join an ongoing group call                                                       | ✔️   | ✔️       | ✔️              | ✔️                 |
 | Mid call control  | Turn your video on/off                                                                                              | ✔️   | ✔️       | ✔️              | ✔️                 |
 |                   | Mute/Unmute mic                                                                                                     | ✔️   | ✔️       | ✔️              | ✔️                 |
-<<<<<<< HEAD
-|                   | Mute other participants    |✔️<sup>1</sup>        |   ✔️<sup>1</sup>     |    ❌              |     ❌      |
-=======
 |                   | Mute other participants    |✔️<sup>1</sup>        |   ✔️<sup>1</sup>       |    ✔️<sup>1</sup>              |     ✔️<sup>1</sup>      |
->>>>>>> b85ee8b7906e (Add the changes for Native Mute Others - Windows)
 |                   | Switch between cameras                                                                                              | ✔️   | ✔️       | ✔️              | ✔️                 |
 |                   | Local hold/un-hold                                                                                                  | ✔️   | ✔️       | ✔️              | ✔️                 |
 |                   | Active speaker                                                                                                      | ✔️   | ✔️       | ✔️              | ✔️                 |

articles/communication-services/how-tos/calling-sdk/includes/manage-calls/manage-calls-windows.md

@@ -129,11 +129,7 @@ this.call.OnStateChanged += Call_OnStateChangedAsync;
 Feel free to use `8:echo123` to talk to the Azure Communication Services echo bot.
 
 ## Mute and unmute
-<<<<<<< HEAD
 To mute or unmute the outgoing audio you can use the `MuteOutgoingAudioAsync` and `UnmuteOutgoingAudioAsync` asynchronous APIs:
-=======
-To mute or unmute the local endpoint you can use the `MuteOutgoingAudioAsync` and `UnmuteOutgoingAudioAsync` asynchronous APIs:
->>>>>>> b85ee8b7906e (Add the changes for Native Mute Others - Windows)
 
 ```csharp
 // mute outgoing audio