diff --git a/poetry/parts/secondary-header.html b/poetry/parts/secondary-header.html
new file mode 100644
index 00000000..d2ae1962
--- /dev/null
+++ b/poetry/parts/secondary-header.html
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
Alas, where words once wandered
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/poetry/templates/404.html b/poetry/templates/404.html
index 16c366f1..41b968ce 100644
--- a/poetry/templates/404.html
+++ b/poetry/templates/404.html
@@ -1,3 +1,34 @@
+<<<<<<< HEAD
+
+
+
+
+
+
+
+
+
+
+
Alas, where words once wandered
+
+
+
+
+
+
+
+
+
+
+
+
+
It looks like nothing was found at this location. Try a search.
+
+
+
+
+
+=======
@@ -10,4 +41,5 @@
404 Not found
-
\ No newline at end of file
+
+>>>>>>> dfce47d (Creates template files for Poetrye's search and 404 pages (#141))