diff --git a/app/views/desktop/journal_lists/index.html.erb b/app/views/desktop/journal_lists/index.html.erb
index d9b7de3d..804787df 100644
--- a/app/views/desktop/journal_lists/index.html.erb
+++ b/app/views/desktop/journal_lists/index.html.erb
@@ -8,29 +8,15 @@
<% end %>
- -
- <%= journal_list %>
+
-
+ <% title, level = journal_list %>
+ <%= title %> -- <%= level.join(",") %>
<% if ( i % 8 ) == 7 %>
<% end %>
<% end %>
-<<<<<<< HEAD
-
-
- <% title, level = journal_list %>
- <%= title %> -- <%= level.join(",") %>
-
-
- <% if ( i % 5 ) == 4 %>
-
-
- <% end %>
- <% end %>
-
-=======
->>>>>>> view update