diff --git a/PCBs/Headphone with PCM5102a and TDA1308/README.md b/PCBs/Headphone with PCM5102a and TDA1308/README.md
index 8df2314..c33b1da 100644
--- a/PCBs/Headphone with PCM5102a and TDA1308/README.md	
+++ b/PCBs/Headphone with PCM5102a and TDA1308/README.md	
@@ -2,7 +2,10 @@
 This is a pcb, that was kindly provided by a user of my ESPuino. It makes use of a DAC named 'PCM5102A' with a TDA1308 as amp. PCM5102A supports I2S, so it can connected in parallel to MAX98357a to the I2S-pins BCLK, LRC and DIN. Of course, it needs 3.3V and GND, too. Please note that SMD-technique is used. <br />
 The 6th pin of connector J1 is used to indicate whether there's a plug or not. That means if there is a plug, this pin is pulled to GND and therefore can be used to connect to MAX98357.SD. Doing so will mute MAX's amp and vice versa. Of course you need a special [headphone jack](https://www.conrad.de/de/p/cliff-fcr1295-klinken-steckverbinder-3-5-mm-buchse-einbau-horizontal-polzahl-3-stereo-schwarz-1-st-705830.html) to use this feature. Additionaly this 6th pin can be connected to the ESP32 in order to make use of the feature `HEADPHONE_ADJUST_ENABLE`. Doing so can optionally limit the headphone's maximum volume (configureable via GUI). <br />
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 15a06350b94ca27ba7d88401436a90da2c068d50
 Please note: the files in my GitHub-repository may be outdated regarding this PCB. Please have a look [here](https://u.pcloud.link/publink/show?code=kZjJVKkZOYso9U99qILNOMm5ehliaFtxldWX).
 
 ## Disclaimer
diff --git a/README.md b/README.md
index d1a0f08..b0dd268 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 News:
 I started this project back in october 2019 and never expected it to become that large. The project grew and grew - so did main.cpp. So it was about time to have it split into modules. This was done in march/april. After spending some time on tests, improvements and implementing new features, refactoring-branch will is NOW the new master whereas the previous master  a new branch named `old`. It will be kept as reference but won't by maintained anymore. Please be advised that moving to refactoring-branch will re-arrange ESP32's partition. All things to know are described [here](https://forum.espuino.de/t/wechsel-zum-refactoring-branch-was-ist-zu-beachten/510) in german language. Development of the new master is documented [here](https://forum.espuino.de/t/refactoring/415). Have fun and don't hesitate to contact me in case of problems/questions.
+
 ## Forum
 * EN: I've set up a primarily German-speaking community with much documentation. Also an international corner for non-German-speakers is available at https://forum.espuino.de. Github-Login can be used there but it's not mandatory.
 * DE: Ich habe ein primär deutschsprachiges Forum aufgesetzt, welches ich mit reichlich Doku versehen habe. Würde mich freuen, euch dort zu sehen: https://forum.espuino.de. Ihr könnt euch dort mit eurem Github-Login einloggen, jedoch auch "normal" anmelden. Dokumenation findet ihr insbesondere hier: https://forum.espuino.de/c/dokumentation/anleitungen/10
diff --git a/src/settings.h b/src/settings.h
index e033924..dcd4e30 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -218,6 +218,7 @@
             constexpr const char topicBatteryVoltage[] PROGMEM = "State/ESPuino/Voltage";
         #endif
     #endif
+<<<<<<< HEAD
 
     // !!! MAKE SURE TO EDIT PLATFORM SPECIFIC settings-****.h !!!
     #if (HAL == 1)
@@ -236,4 +237,6 @@
         #include "settings-custom.h"                        // Contains all user-relevant settings custom-board
     #endif
 
+=======
+>>>>>>> 15a06350b94ca27ba7d88401436a90da2c068d50
 #endif