diff --git a/blink.ino b/blink.ino
index 54d7e426..899df25b 100644
--- a/blink.ino
+++ b/blink.ino
@@ -18,7 +18,11 @@ void setup() {
 // the loop routine runs over and over again forever:
 void loop() {
   digitalWrite(led, HIGH);   // turn the LED on (HIGH is the voltage level)
-  delay(1000);               // wait for a second
+  delay(3000);               // wait for a second
   digitalWrite(led, LOW);    // turn the LED off by making the voltage LOW
+<<<<<<< HEAD
+  delay(3000);               // wait for a second
+=======
   delay(2000);               // wait for a second
+>>>>>>> upstream/master
 }