diff --git a/ccsrc/Protocols/UDP/udp_layer.hh b/ccsrc/Protocols/UDP/udp_layer.hh
index c24d833568cb364c6b01bed39de5e42d52bfe0f2..90657b22e61d578284071452925f6ce4acd6c4e0 100644
--- a/ccsrc/Protocols/UDP/udp_layer.hh
+++ b/ccsrc/Protocols/UDP/udp_layer.hh
@@ -17,6 +17,11 @@
 
 #include "layer.hh"
 
+<<<<<<< HEAD
+=======
+#include "params.hh"
+
+>>>>>>> Bug fixed on params type
 using namespace std; // Required for isnan()
 #include "Abstract_Socket.hh"
 
@@ -27,7 +32,11 @@ using namespace std; // Required for isnan()
  * \brief  This class provides description of ITS UDP/IP protocol layer
  */
 class udp_layer : public layer, public PORT {
+<<<<<<< HEAD
   params             _params; //! Layer parameters
+=======
+  params         _params; //! Layer parameters
+>>>>>>> Bug fixed on params type
   struct sockaddr_in _saddr;  //! Source socket address description
   struct sockaddr_in _daddr;  //! Destination socket address description
   bool               _reuse_incoming_source_adddress;