diff --git a/firmware/numPAD_Arduino/numPAD_Arduino.ino b/firmware/numPAD_Arduino/numPAD_Arduino.ino
index 573e97c..d2afe6f 100644
--- a/firmware/numPAD_Arduino/numPAD_Arduino.ino
+++ b/firmware/numPAD_Arduino/numPAD_Arduino.ino
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #include <Keyboard.h>
 
 // TODO: LED Config
@@ -148,4 +149,6 @@ void keyPressed(int row, int col) {
 void resetKey(int row, int col) {
   keyDown[row][col] = 0;
   keyLong[row][col] = false;
+=======
+>>>>>>> 6d38bb4a8060dbb25b823b341264b72dd73cebf1
 }