Much needed config refactor

config_greyhash.cmake

@@ -67,7 +67,6 @@ set(BOBBYCAR_BUILDFLAGS
 #   -DPINS_LEDSTRIP=33
 #   -DLEDSTRIP_DEFAULT_BRIGHTNESS=100
 #  -DLEDSTRIP_WRONG_DIRECTION
-<<<<<<< HEAD
   -DLEDSTRIP_ANIMATION_DEFAULT=2
   -DLEDS_PER_METER=144
   -DOLD_NVS
@@ -75,8 +74,6 @@ set(BOBBYCAR_BUILDFLAGS
 #  -DSWITCH_BLINK
 #  -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
   -DFEATURE_ESPNOW
-=======
->>>>>>> 99526a5 (Moved FEATURE_DNS_NS into config-system)
 )
 
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")