diff --git a/usermods/Enclosure_with_OLED_temp_ESP07/readme.md b/usermods/Enclosure_with_OLED_temp_ESP07/readme.md
index 598c0c0a..4af36d59 100644
--- a/usermods/Enclosure_with_OLED_temp_ESP07/readme.md
+++ b/usermods/Enclosure_with_OLED_temp_ESP07/readme.md
@@ -1,5 +1,7 @@
 # Almost universal controller board for outdoor applications
 This usermod is using ideas from @mrVanboy and @400killer
+## Project repository
+-   [Original repository](https://github.com/srg74/Controller-for-WLED-firmware) - Main controller repository
 ## Features
 *   SSD1306 128x32 and 128x64 I2C OLED display
 *   On screen IP address, SSID and controller status (e.g. ON or OFF, recent effect)
diff --git a/usermods/Enclosure_with_OLED_temp_ESP07/wled06_usermod.ino b/usermods/Enclosure_with_OLED_temp_ESP07/wled06_usermod.ino
index b3f1c5db..31bba9e6 100644
--- a/usermods/Enclosure_with_OLED_temp_ESP07/wled06_usermod.ino
+++ b/usermods/Enclosure_with_OLED_temp_ESP07/wled06_usermod.ino
@@ -17,15 +17,9 @@ long lastMeasure = 0;
 // or check the gallery:
 // https://github.com/olikraus/u8g2/wiki/gallery
 // --> First choise of cheap I2C OLED 128X32
-<<<<<<< HEAD
 U8X8_SSD1306_128X32_UNIVISION_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
 // --> Second choise of cheap I2C OLED 128X64
 //U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
-=======
-//U8X8_SSD1306_128X32_UNIVISION_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
-// --> Second choise of cheap I2C OLED 128X64
-U8X8_SSD1306_128X64_NONAME_HW_I2C u8x8(U8X8_PIN_NONE, U8X8_PIN_SCL, U8X8_PIN_SDA); // Pins are Reset, SCL, SDA
->>>>>>> 1680c014057bb993974950f37b14369b398ca647
 // gets called once at boot. Do all initialization that doesn't depend on
 // network here
 void userSetup() {
@@ -209,4 +203,4 @@ void userLoop() {
   u8x8.drawGlyph(0, 1, 68); // home icon
   u8x8.setFont(u8x8_font_open_iconic_weather_2x2);
   u8x8.drawGlyph(0, 2, 66 + (bri > 0 ? 3 : 0)); // sun/moon icon
-}
+}
\ No newline at end of file