diff --git a/Sources/App/simulator-configuration.swift b/Sources/App/simulator-configuration.swift
index c96b24b..7f94f6f 100644
--- a/Sources/App/simulator-configuration.swift
+++ b/Sources/App/simulator-configuration.swift
@@ -1,9 +1,6 @@
 import Crypto
 import Foundation
-<<<<<<< HEAD
 import FoundationNetworking
-=======
->>>>>>> 5d78c9be5855d5541dd07b24d8331c018ddd2c70
 import IoT_Simulator_Core
 import MessageUtils