diff --git a/static/timeline.css b/static/timeline.css
index 889e32d..3bdb5fa 100644
--- a/static/timeline.css
+++ b/static/timeline.css
@@ -1,85 +1,172 @@
-body{ 
-	width: max-content;
-	background-color: #F4EBE8;
-}
-
-h1 {
-	font-family: Roboto Mono;
-	font-size: 40px;
-	margin-top: 1%;
-}
-
-h2 {
-	font-size: 17px;
-	background-color: #0BEFEB;
-	padding: 5px;
-}
-
-div#body{ width: max-content;}
-
-.mw-parser-output{
-	/*! position: left top; */
-	/*! display: hidden; */
-	/*! display: inline; */
-	/*! vertical-align: top; */
-}
-
-.mw-parser-output > p{
-display: inline-block;
-}
-
-.content {
-	display: flex;
-	margin-right: 10vw;
-	margin-left: 5vw;
-}
-
-.indexlink {
-	position: fixed;
-	font-size: 20px;
-	bottom: 0%;
-	right: 3%;
-	background-color: transparent;
-	border: none;
-	border-right-color: transparent;
-	z-index: 10;
-	padding: 0px 30px 20px 10px
-	border: none;
-}
-
-.indexlink a {
-	text-decoration: none;
-}
-
-.event {
-	margin-top: 3%;
-	text-align-last: auto;
-	font-family: Roboto Mono;
-	font-size: 10px;
-	padding-left: 5vw;
-	display: inline-block;
-	width:200px;
-	vertical-align: top;
-}
-
-.eventfirstpages {
-	padding-bottom: 5vh;
-}
-
-.pubpageinfo {
-	font-size: 15px;
-}
-
-.thumbborder {
-	box-shadow: 10px 10px 15px #C4BCB9;
-	width: 40%;
-	height: auto;
-}
-
-.thumbborder:hover {
-	box-shadow: 10px 10px 15px #0BEFEB;
-	width:100%; 
-	transition:0.5s;
-	height: auto;
-}
-
+<<<<<<< HEAD
+body{ 
+	width: max-content;
+	background-color: #F4EBE8;
+}
+
+h1 {
+	font-family: Roboto Mono;
+	font-size: 40px;
+	margin-top: 1%;
+}
+
+h2 {
+	font-size: 17px;
+	background-color: #0BEFEB;
+	padding: 5px;
+}
+
+div#body{ width: max-content;}
+
+.mw-parser-output{
+	/*! position: left top; */
+	/*! display: hidden; */
+	/*! display: inline; */
+	/*! vertical-align: top; */
+}
+
+.mw-parser-output > p{
+display: inline-block;
+}
+
+.content {
+	display: flex;
+	margin-right: 10vw;
+	margin-left: 5vw;
+}
+
+.indexlink {
+	position: fixed;
+	font-size: 20px;
+	bottom: 0%;
+	right: 3%;
+	background-color: transparent;
+	border: none;
+	border-right-color: transparent;
+	z-index: 10;
+	padding: 0px 30px 20px 10px
+	border: none;
+}
+
+.indexlink a {
+	text-decoration: none;
+}
+
+.event {
+	margin-top: 3%;
+	text-align-last: auto;
+	font-family: Roboto Mono;
+	font-size: 10px;
+	padding-left: 5vw;
+	display: inline-block;
+	width:200px;
+	vertical-align: top;
+}
+
+.eventfirstpages {
+	padding-bottom: 5vh;
+}
+
+.pubpageinfo {
+	font-size: 15px;
+}
+
+.thumbborder {
+	box-shadow: 10px 10px 15px #C4BCB9;
+	width: 40%;
+	height: auto;
+}
+
+.thumbborder:hover {
+	box-shadow: 10px 10px 15px #0BEFEB;
+	width:100%; 
+	transition:0.5s;
+	height: auto;
+}
+=======
+body{ 
+	width: max-content;
+	background-color: #F4EBE8;
+}
+
+h1 {
+	font-family: Roboto Mono;
+	font-size: 40px;
+	margin-top: 1%;
+}
+
+h2 {
+	font-size: 17px;
+	background-color: #0BEFEB;
+	padding: 5px;
+}
+
+div#body{ width: max-content;}
+
+.mw-parser-output{
+	/*! position: left top; */
+	/*! display: hidden; */
+	/*! display: inline; */
+	/*! vertical-align: top; */
+}
+
+.mw-parser-output > p{
+display: inline-block;
+}
+
+.content {
+	display: flex;
+	margin-right: 10vw;
+	margin-left: 5vw;
+}
+
+.indexlink {
+	position: fixed;
+	font-size: 20px;
+	bottom: 0%;
+	right: 3%;
+	background-color: transparent;
+	border: none;
+	border-right-color: transparent;
+	z-index: 10;
+	padding: 0px 30px 20px 10px
+	border: none;
+}
+
+.indexlink a {
+	text-decoration: none;
+}
+
+.event {
+	margin-top: 3%;
+	text-align-last: auto;
+	font-family: Roboto Mono;
+	font-size: 10px;
+	padding-left: 5vw;
+	display: inline-block;
+	width:200px;
+	vertical-align: top;
+}
+
+.eventfirstpages {
+	padding-bottom: 5vh;
+}
+
+.pubpageinfo {
+	font-size: 15px;
+}
+
+.thumbborder {
+	box-shadow: 10px 10px 15px #C4BCB9;
+	width: 40%;
+	height: auto;
+}
+
+.thumbborder:hover {
+	box-shadow: 10px 10px 15px #0BEFEB;
+	width:100%; 
+	transition:0.5s;
+	height: auto;
+}
+
+>>>>>>> 86577e11087078ad95a30c5f9400661fcc23c03d
diff --git a/templates/timeline.html b/templates/timeline.html
index 5c58fc1..3014ca5 100644
--- a/templates/timeline.html
+++ b/templates/timeline.html
@@ -1,16 +1,34 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="{{ staticpath }}/static/archive.css" />
-    <link rel="stylesheet" href="{{ staticpath }}/static/timeline.css" />
-    <link href='https://fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
-    <title>Timeline</title>
-</head>
-<body>
-    <div class="pagelink">Timeline</div>
-    <div id="body">{{ body|safe }}</div>
-
-</body>
-</html>
-
+<<<<<<< HEAD
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="{{ staticpath }}/static/archive.css" />
+    <link rel="stylesheet" href="{{ staticpath }}/static/timeline.css" />
+    <link href='https://fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
+    <title>Timeline</title>
+</head>
+<body>
+    <div class="pagelink">Timeline</div>
+    <div id="body">{{ body|safe }}</div>
+
+</body>
+</html>
+=======
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="{{ staticpath }}/static/archive.css" />
+    <link rel="stylesheet" href="{{ staticpath }}/static/timeline.css" />
+    <link href='https://fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
+    <title>Timeline</title>
+</head>
+<body>
+    <div class="pagelink">Timeline</div>
+    <div id="body">{{ body|safe }}</div>
+
+</body>
+</html>
+
+>>>>>>> 86577e11087078ad95a30c5f9400661fcc23c03d