diff --git a/app/drivers/led/CMakeLists.txt b/app/drivers/led/CMakeLists.txt
index 01472e83..136fb02a 100644
--- a/app/drivers/led/CMakeLists.txt
+++ b/app/drivers/led/CMakeLists.txt
@@ -1,10 +1,16 @@
 # Copyright (c) 2020 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 =======
 #zephyr_library()
 
+#zephyr_library_sources(led.c)
+>>>>>>> Stashed changes
+=======
+#zephyr_library()
+
 #zephyr_library_sources(led.c)
 >>>>>>> Stashed changes
 add_subdirectory_ifdef(CONFIG_IS31FL3733 is31fl3733)