diff --git a/mod_carousel.php b/mod_carousel.php
index 81a0934..9e5ca9b 100644
--- a/mod_carousel.php
+++ b/mod_carousel.php
@@ -16,12 +16,9 @@
 //store params as object that we can loop through in tmpl/default.php
 $slideritems = new stdClass;
 
-<<<<<<< HEAD
-for ($i=1; $i <= 3; $i++) { 
-        $slideritems->$i = new stdClass;
-=======
+
 for ($i=1; $i <= 6; $i++) { 
->>>>>>> 6248772a906d6369fc6cafe301b56bd883689c50
+	$slideritems->$i = new stdClass;
 	$slideritems->$i->heading = $params->get("slide".$i."_heading");
 	$slideritems->$i->text = $params->get("slide".$i."_text");
 	$slideritems->$i->background_image = $params->get("slide".$i."_background_image");
diff --git a/tmpl/default.php b/tmpl/default.php
index c6de64d..c0ad125 100644
--- a/tmpl/default.php
+++ b/tmpl/default.php
@@ -57,4 +57,4 @@
           <span class="icon-next"></span>
         </a>
 </div>
->>>>>>> 6248772a906d6369fc6cafe301b56bd883689c50
+