diff --git a/app/overview/controllers/log-controller.html b/app/overview/controllers/log-controller.html
index 47429f5..74d74aa 100644
--- a/app/overview/controllers/log-controller.html
+++ b/app/overview/controllers/log-controller.html
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <div id="event-log">
     <div class="row column">
         <h1>Event Log</h1>
@@ -419,4 +420,9 @@
         </div>
     </section>
     <paginate ng-include="paginate"></paginate>
-</div> <!-- end event log -->
\ No newline at end of file
+</div> <!-- end event log -->
+=======
+<div id="uid-log">
+    Log contents here
+</div>
+>>>>>>> 4c1a3dd... Major update to code structure