diff --git a/www/index.php b/www/index.php
index b13b87d..cdfdcc4 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,9 +1,4 @@
-<<<<<<< e4e8b0972bbec3fff581f7a97b34315265104f3a
 <?php require '../src/_autoload.php'; ?><!DOCTYPE html>
-=======
-<?php require "../src/_autoload.php"; ?>
-<!DOCTYPE html>
->>>>>>> Add automatic agenda on front page.
 <title>Programvareverkstedet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
