diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5eb79716..a8bddf63 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,10 @@ jobs:
           - kyria_right
           - lily58_left
           - lily58_right
+<<<<<<< HEAD
+
+=======
+>>>>>>> parent of c3164f4... Updated build.yaml
         include:
           - board: proton_c
             shield: clueboard_california