diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs
index bda0c27..bb1ab3a 100644
--- a/DangerousD/GameCore/Managers/AppManager.cs
+++ b/DangerousD/GameCore/Managers/AppManager.cs
@@ -178,7 +178,7 @@ namespace DangerousD.GameCore
         {
             foreach (NetworkTask networkTask in networkTasks)
             {
-<<<<<<< HEAD
+
                 switch (networkTask.operation)
                 {
                     case NetworkTaskOperationEnum.TakeDamage:
@@ -199,25 +199,9 @@ namespace DangerousD.GameCore
                     default:
                         break;
                 }
-=======
-                case NetworkTaskOperationEnum.TakeDamage:
-                    break;
-                case NetworkTaskOperationEnum.SendSound:
-                   // SoundManager.StartSound(networkTask.name, networkTask.position, GameManager.GetPlayer1.Pos);
-                    break;
-                case NetworkTaskOperationEnum.CreateEntity:
-                    break;
-                case NetworkTaskOperationEnum.SendPosition:
-                    break;
-                case NetworkTaskOperationEnum.ChangeState:
-                    break;
-                case NetworkTaskOperationEnum.ConnectToHost:
-                    break;
-                case NetworkTaskOperationEnum.GetClientPlayerId:
-                    break;
-                default:
-                    break;
->>>>>>> livingEntitiesVlad
+
+                
+                    
             }
 
         }