diff --git a/templates/index.tpl b/templates/index.tpl
index c0fac65c..174ad63c 100755
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -3,47 +3,6 @@
 	[[+include file="header.tpl]]
 </head>
 <body>
-<<<<<<< HEAD
-	<div class="top vcent centered">
-		<div id="change" class="small">
-			<?php 
-				if(isset($_GET['chan'])) header('Location: '.$_GET['chan']);
-				$list = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"])));
-				if($list[1]==""||!isset($list[1])||count($list)<=1){$list="";include('php/nochan.php');die();}
-				else $list=$list[1];
-			?>
-			<a id="toptitle" href="/">Zöff</a>
-			<div id="chan" class="chan" title="Show big URL" onclick="show()"><?php echo(ucfirst($list));?></div>
-			<input id="search" name="v" type="text" class="search_input innbox" spellcheck="false" placeholder="Search" onsubmit="null;" autocomplete="off"/>
-			<div id="results"></div>
-			<div class="main">
-				<div id="player" class="ytplayer"></div>
-
-				<div class="playlist" >
-				<div id="buttons" class="result">
-					<!--<a href="/php/admin.php?list=<?php echo $list; ?>" title="Channel settings" ><img src="/static/settings2.png" class="skip middle" alt="Settings"/></a>-->
-					<img src="/static/settings2.png" class="skip middle" alt="Settings" title="Settings" onclick="admin();"/>
-					<img src="/static/skip.png" class="skip" alt="Skip" title="Skip" onclick="skip();">
-				</div>
-					<div id="adminPanel"></div>
-					<div id="playlist">
-						<div id="wrapper">
-
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="footer small centered top anim">&copy; 2014 <a class="anim" href="//nixo.no">Nixo</a> &amp; <a class="anim" href="//kasperrt.no">KasperRT </a>&amp; David  </div>
-
-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-		<script type="text/javascript" src="static/js/iscroll.js"></script>  
-		<script type="text/javascript" src="static/js/list.js"></script>  
-		<script type="text/javascript" src="static/js/youtube.js"></script>
-		<script type="text/javascript" src="static/js/search.js"></script> 
-		<script type="text/javascript" src="static/js/admin.js"></script>
-		<script type="text/javascript" src="static/js/visualize.js"></script> 
-=======
 <div class="top vcent centered">
     <div id="change" class="small">
         <div class="bigchan nomargin">Zöff</div>
@@ -61,20 +20,6 @@
         </div>
     </center>
 </div>
-<<<<<<< HEAD
-<div class="footer small centered top anim bottom">
-    &copy; 2014 <a class="anim" href="//nixo.no">Nixo</a> &amp; <a class="anim" href="//kasperrt.no">KasperRT </a>&amp; David
-</div>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-<script type="text/javascript" src="static/js/iscroll.js"></script>  
-<script type="text/javascript" src="static/js/list.js"></script>  
-<script type="text/javascript" src="static/js/youtube.js"></script>
-<script type="text/javascript" src="static/js/search.js"></script> 
-<script type="text/javascript" src="static/js/admin.js"></script>
-<script type="text/javascript" src="static/js/visualize.js"></script> 
->>>>>>> Fixed template for the frontpage
-=======
 [[+include file="footer.tpl"]]
->>>>>>> Fixed stuff
 </body>
 </html>
