diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6c48d49..8bf5728 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,15 +4,9 @@
             "type": "lldb",
             "request": "launch",
             "args": [],
-<<<<<<< HEAD
-            "cwd": "${workspaceFolder:workspace}",
-            "name": "Debug IoT-Simulator",
-            "envFile": "${workspaceFolder}/env/debug/.debug.env",
-=======
             "cwd": "${workspaceFolder}",
             "name": "Debug IoT-Simulator",
             "envFile": "${workspaceFolder}/env/debug/debug.env",
->>>>>>> 5d78c9be5855d5541dd07b24d8331c018ddd2c70
             "program": "${workspaceFolder}/.build/debug/App",
             "preLaunchTask": "swift: Build Debug IoT-Simulator"
         },
@@ -24,27 +18,6 @@
             "name": "Release IoT-Simulator",
             "program": "${workspaceFolder:workspace}/.build/release/IoT-Simulator",
             "preLaunchTask": "swift: Build Release IoT-Simulator"
-<<<<<<< HEAD
-=======
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "args": [],
-            "cwd": "${workspaceFolder:workspace}",
-            "name": "Debug App",
-            "program": "${workspaceFolder:workspace}/.build/debug/App",
-            "preLaunchTask": "swift: Build Debug App"
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "args": [],
-            "cwd": "${workspaceFolder:workspace}",
-            "name": "Release App",
-            "program": "${workspaceFolder:workspace}/.build/release/App",
-            "preLaunchTask": "swift: Build Release App"
->>>>>>> 5d78c9be5855d5541dd07b24d8331c018ddd2c70
         }
     ]
 }
\ No newline at end of file