diff --git a/app/drivers/CMakeLists.txt b/app/drivers/CMakeLists.txt
index 859e6c29..3603be75 100644
--- a/app/drivers/CMakeLists.txt
+++ b/app/drivers/CMakeLists.txt
@@ -4,8 +4,4 @@
 add_subdirectory(gpio)
 add_subdirectory(kscan)
 add_subdirectory(sensor)
-<<<<<<< HEAD
 add_subdirectory(led)
-=======
-add_subdirectory(display)
->>>>>>> e6645882c32454251466949fa9a6447b195acd72