diff --git a/demo/src/main/resources/templates/create-account.html b/demo/src/main/resources/templates/create-account.html
index 2d9afb6..78ec2d3 100644
--- a/demo/src/main/resources/templates/create-account.html
+++ b/demo/src/main/resources/templates/create-account.html
@@ -1,29 +1,17 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<<<<<<< HEAD
-  <meta charset="UTF-8">
-  <title>Create Thyme Crunch Account</title>
-  <link rel="stylesheet" th:href="@{static/css/create-account.css}">
-=======
     <meta charset="UTF-8">
     <title>Create Thyme Crunch Account</title>
     <link rel="stylesheet" th:href="@{css/create-account.css}">
->>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
 </head>
 <body>
 
 <header class="top-header">
-<<<<<<< HEAD
-    <img src="static/images/header_left.png" alt="Violin f-hole shape to the left of header." class="swirl">
-    <h1 class="site-name">Thyme Crunch</h1>
-    <img src="static/images/header_right.png" alt="Violin f-hole shape to the right of header." class="swirl">
-=======
     <img th:src="@{images/header_left.png}" alt="Violin f-hole shape to the left of header." class="swirl">
     <h1 class="site-name">Thyme Crunch</h1>
     <img th:src="@{images/header_right.png}" alt="Violin f-hole shape to the right of header." class="swirl">
 </header>
->>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
 
 <!-- Main Content -->
 <main class="main-content">
diff --git a/demo/src/main/resources/templates/home.html b/demo/src/main/resources/templates/home.html
index 7e9406c..941aba3 100644
--- a/demo/src/main/resources/templates/home.html
+++ b/demo/src/main/resources/templates/home.html
@@ -1,57 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<<<<<<< HEAD
-  <meta charset="UTF-8">
-  <title>Thyme Crunch Home</title>
-  <link rel="stylesheet" th:href="@{/css/home.css}">
-=======
     <meta charset="UTF-8">
     <title>Thyme Crunch Home</title>
     <link rel="stylesheet" th:href="@{css/home.css}">
->>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
 </head>
 <body>
 
 <header class="top-header">
-<<<<<<< HEAD
-    <img src="static/images/header_left.png" alt="Violin f-hole shape to the left of header." class="swirl">
-    <h1 class="site-name">Thyme Crunch</h1>
-    <img src="static/images/header_right.png" alt="Violin f-hole shape to the right of header." class="swirl">
-  </header>
-=======
     <img th:src="@{images/header_left.png}" alt="Violin f-hole shape to the left of header." class="swirl">
     <h1 class="site-name">Thyme Crunch</h1>
     <img th:src="@{images/header_right.png}" alt="Violin f-hole shape to the right of header." class="swirl">
 </header>
->>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
 
 <div class="container">
     <!--Navigation Bar -->
     <nav class="sidebar-left">
-<<<<<<< HEAD
-      <ul>
-        <li><a href="#">Home</a></li>
-        <li><a href="#">Explore</a></li>
-        <li><a href="#">Profile</a></li>
-        <li><a href="#">Saved</a></li>
-	<li>
-	<form action="/logout" method="post">
-	  <button type="submit" class="nav_icon">    
-	    <img src="static/images/logout_icon.png" alt="Log Out Icon">
-	</button>
-	</li>
-      </ul>
-    </nav>
-
-
-</nav>
-
-<a href="#" target="_blank" class="create_icon">
-    <img src="static/images/create_icon.png" alt="Description of the icon">
-</a>
-
-=======
         <ul>
             <li><a href="#">Home</a></li>
             <li><a href="#">Explore</a></li>
@@ -67,9 +31,8 @@
 
 
     <a href="#" target="_blank" class="create_icon">
-        <img src="images/create_icon.png" alt="Description of the icon">
+        <img th:src="@{images/create_icon.png}" alt="Description of the icon">
     </a>
->>>>>>> 738c6970dde9507734a43ead0f3e9aadd5b41e23
 
     <!-- Main Content -->
     <main class="main-content">
