diff --git a/Sources/App/simulator-configuration.swift b/Sources/App/simulator-configuration.swift
index f00f056..c96b24b 100644
--- a/Sources/App/simulator-configuration.swift
+++ b/Sources/App/simulator-configuration.swift
@@ -52,7 +52,6 @@ private func jsonConfigurationParser(_ json: [String: Any]) async throws {
                     try IoTSimulatorCore.addDevice(location: env.location, device: dev) { msg in
                         // UGLY: But fast
                         // TODO: add sending code here
-<<<<<<< HEAD
                         let backendURL = ProcessInfo.processInfo.environment["BACKEND_URL"]!
 
                         var httpRequest = URLRequest(url: URL(string: backendURL)!)
@@ -62,8 +61,6 @@ private func jsonConfigurationParser(_ json: [String: Any]) async throws {
                         httpRequest.httpBody = msg
                         let _ = try await URLSession.shared.upload(for: httpRequest, from: msg)
 
-=======
->>>>>>> 5d78c9be5855d5541dd07b24d8331c018ddd2c70
                     } failure: {
                         print("Failed")
                     }