diff --git a/src/header.h b/src/header.h
index bacec3d..9f8f33a 100644
--- a/src/header.h
+++ b/src/header.h
@@ -55,13 +55,7 @@
 // MQTT
 #define MQTT_HOST "mqtt.timovolkmann.de"
 #define MQTT_PORT 1883
-<<<<<<< HEAD
-#define MQTT_DEVICE_ID "esp-andy"
-||||||| cbf5199
 #define MQTT_DEVICE_ID "esp-timo"
-=======
-#define MQTT_DEVICE_ID "esp-sebastian"
->>>>>>> 18b5c0bfeceb30e12c570e73ae16fb9bc390c4e1
 #define MQTT_TOPIC_BASE_SUB "smartgarden/commands"
 #define MQTT_TOPIC_BASE_PUB "smartgarden/updates"
 #define MQTT_PATH_PUB MQTT_TOPIC_BASE_PUB "/" MQTT_DEVICE_ID "/"