<!-- Sidebar -->
<div id="sidebar-wrapper">
  <ul class="sidebar-nav">
    <li class="sidebar-brand"><a href="/">Home</a></li>
    <li><a href="/conduct">Code of Conduct</a></li>
    <li><a href="/diversity">Diversity Statement</a></li>
    <li><a href="/tickets">Buy Tickets</a></li>
    <li><a href="/schedule">Schedule</a></li>
    <li><a href="/speakers">Speakers</a></li>
    <li><a href="/sponsors">Sponsors</a></li>
<<<<<<< HEAD
    <li><a href="/info">Event Information</a></li>
    <li><a href="/diversity">Diversity Statement</a></li>
=======
    <li><a href="/visiting">Visiting Seattle</a></li>
>>>>>>> create-visiting
  </ul>
</div>

<!-- Sidebar -->
<div id="sidebar-wrapper">
  <ul class="sidebar-nav">
    <li class="sidebar-brand"><a href="/">Home</a></li>
    <li><a href="/conduct">Code of Conduct</a></li>
    <li><a href="/diversity">Diversity Statement</a></li>
    <li><a href="/tickets">Buy Tickets</a></li>
    <li><a href="/schedule">Schedule</a></li>
    <li><a href="/speakers">Speakers</a></li>
    <li><a href="/sponsors">Sponsors</a></li>
    <li><a href="/diversity">Diversity Statement</a></li>
    <li><a href="/visiting">Visiting Seattle</a></li>
  </ul>
</div>

Fix merge detritus in Sidebar
Fix merge detritus in Sidebar
