fixed leds
merged conflicts