diff --git a/main.js b/main.js
index e9d0a80..194229e 100644
--- a/main.js
+++ b/main.js
@@ -14,7 +14,6 @@ clock = new Clock(6);
 
 var blocks = [];
 
-<<<<<<< HEAD
 for (var i = 0; i < 12; i++) {
 	blocks.push(new Block(i, 'green'));
 }