diff --git a/libsrc/leddevice/ProviderUdp.cpp b/libsrc/leddevice/ProviderUdp.cpp
index c160fc70..bd564433 100644
--- a/libsrc/leddevice/ProviderUdp.cpp
+++ b/libsrc/leddevice/ProviderUdp.cpp
@@ -28,11 +28,7 @@ ProviderUdp::~ProviderUdp()
 	_udpSocket->close();
 }
 
-<<<<<<< HEAD
 bool ProviderUdp::setConfig(const Json::Value &deviceConfig, int defaultLatchTime, int defaultPort, std::string defaultHost)
-=======
-bool ProviderUdp::setConfig(const Json::Value &deviceConfig, int defaultPort, std::string defaultHost)
->>>>>>> ad785b9eba371bca0829b8dc7df80c30afdc052a
 {
 	QString host = QString::fromStdString(deviceConfig.get("host",defaultHost).asString());
 	
@@ -52,11 +48,7 @@ bool ProviderUdp::setConfig(const Json::Value &deviceConfig, int defaultPort, st
 		Debug( _log, "Successfully parsed %s as a hostname.", deviceConfig["host"].asString().c_str());
 		_address = info.addresses().first();
 	}
-<<<<<<< HEAD
-	
-=======
 
->>>>>>> ad785b9eba371bca0829b8dc7df80c30afdc052a
 	_port = deviceConfig.get("port", defaultPort).asUInt();
 	if ( _port<=0 || _port > 65535)
 	{