Fix merge conflicts

diff --cc template/base.html
index cd049683a36a68ef50cf8db7ab634f7f87f45a4b,914ca737aeefbc4c64a3721720ca68823838ef3b..765fe69ec71a121dabb3a82a537f37276d630247
--- 1/template/base.html
--- 2/template/base.html
+++ b/template/base.html
@@@ -39,7 -39,7 +39,7 @@@
                        <ul class="nav navbar-nav navbar-right">
                            <li><a href="/">Home</a></li>
                <li><a href="https://docs.google.com/forms/d/1ZSmUMgLcZSdyAyr_qkoUQM7FBEyHQVuV8uUJ_dywJZ8/edit">Become a member</a></li>
-               <li><a href="https://2019.beta.pgdu.org/">PGDay 2019</a></li>
 -              <li><a href="https://2019.beta.pgdu.org/">PGDU 2019</a></li>
++              <li><a href="https://2019.pgdu.org/">PgDU 2019</a></li>
              {%if user.is_authenticated %}
                <li><a href="/logout">Log Out</a></li>
              {%endif%}
@@@ -61,7 -61,7 +61,11 @@@
            <!-- Footer -->
            <footer id="side">
                <p>
++<<<<<<< HEAD
 +              <a href="/code-of-conduct">Code of Conduct</a> | @PGDayAU | <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a> | © 2019 PostgreSQL Down Under Inc.
++=======
+               <a href="/code-of-conduct">Code of Conduct</a> | @PGDU | <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a> | © 2019 PostgreSQL Down Under Inc.
++>>>>>>> testing
          </p>
        </footer>
  

diff --cc template/base_pgdu.html
index b44812fc8962b2e2bd9fa6ba4000a832d5acf8ab,af620238b4fb9685e3e420c0b06add5b71e6aa39..6f504b159634de108c6da3abb194cc457da8a4b0
--- 1/template/base_pgdu.html
--- 2/template/base_pgdu.html
+++ b/template/base_pgdu.html
@@@ -39,7 -39,7 +39,7 @@@
                        <ul class="nav navbar-nav navbar-right">
                            <li><a href="/">Home</a></li>
                <li><a href="https://docs.google.com/forms/d/1ZSmUMgLcZSdyAyr_qkoUQM7FBEyHQVuV8uUJ_dywJZ8/edit">Become a member</a></li>
-               <li><a href="https://2019.pgdu.org/">PGDay 2019</a></li>
 -              <li><a href="https://2019.beta.pgdu.org/">PGDU 2019</a></li>
++              <li><a href="https://2019.pgdu.org/">PgDU 2019</a></li>
              {%if user.is_authenticated %}
                <li><a href="/logout">Log Out</a></li>
              {%endif%}