diff --git a/dmp-frontend/src/index.html b/dmp-frontend/src/index.html
index 12c58fcbd..fe639613d 100644
--- a/dmp-frontend/src/index.html
+++ b/dmp-frontend/src/index.html
@@ -1,35 +1,3 @@
-<<<<<<< HEAD
-<!doctype html>
-<html>
-
-<head>
-	<meta charset="utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<title>Data Management Plans Creator</title>
-	<base href="/">
-	<meta name="csrf-token" content="2c64def7de30197c40276fe1a7ea874ca8871f70be7d7dc3305465a4d5c565e4">
-	<!-- <meta name="viewport" content="width=device-width, initial-scale=1"> -->
-	<link rel="icon" type="image/x-icon" href="favicon.ico">
-	<script src="//connect.facebook.net/en_US/all.js"></script>
-	<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-	<script src="https://apis.google.com/js/platform.js" async defer></script>
-	<script type="text/javascript" src="//platform.linkedin.com/in.js">
-		api_key: 86bl8vfk77clh9
-	</script>
-	<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-
-	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-
-</head>
-
-<body>
-	<app-root></app-root>
-</body>
-
-=======
-<!doctype html>
 <html>
 
 <head>
@@ -60,5 +28,4 @@
 	<app-root></app-root>
 </body>
 
->>>>>>> e835c35c7c2df46316e4801fcd46c6e098651645
 </html>
\ No newline at end of file
