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