diff --git a/board.html b/board.html
index 8b5152b..e591c0d 100644
--- a/board.html
+++ b/board.html
@@ -160,12 +160,7 @@ body {
     <div id="debugOut"> </div>
 	</div>
 </div>
-<<<<<<< HEAD
 <!-- <div id="footer">
-=======
-<!--
-<div id="footer">
->>>>>>> 754c9a7bd9436bf6309b8a11822ff7b2e3014aee
 <h2>Send an SMS with a message to <span class="number" style="color:#3399ff;"></span></h2>
 </div>
 -->