diff --git a/cube/User/Inc/config.h b/cube/User/Inc/config.h
index dd551e5..586b9b5 100644
--- a/cube/User/Inc/config.h
+++ b/cube/User/Inc/config.h
@@ -13,10 +13,6 @@ typedef struct __attribute__((__packed__)) s_configBlock {
     char deviceId[16];
     char sharedSecret[SHA256_BLOCK_SIZE];
     char sinkServer[48];
-<<<<<<< HEAD
-    uint8_t macAddress[6];
-    uint8_t filler[22];
-=======
     union {
         struct {
             uint8_t macAddress[6];
@@ -27,7 +23,6 @@ typedef struct __attribute__((__packed__)) s_configBlock {
         } wifi;
     } networkspecific;
     uint8_t filler[11];
->>>>>>> network_abstraction_layer
 } t_configBlock;
 
 
diff --git a/cube/User/Src/config.c b/cube/User/Src/config.c
index 2346acd..6fbe178 100644
--- a/cube/User/Src/config.c
+++ b/cube/User/Src/config.c
@@ -10,10 +10,7 @@
 t_configBlock defaultConfigBlock = {
     .configMagic = CONFIG_MAGIC,
     .deviceName = "MainsCnt",
-<<<<<<< HEAD
-=======
     .networkspecific.lan.macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0F },
->>>>>>> network_abstraction_layer
     .ntpServer = "0.de.pool.ntp.org",
     .deviceId = "MainsCnt01",
     .sharedSecret = "sharedSecretGanzGeheim",