resolving conflicts

diff --cc templates/base.html
index df7bf41aaf4c36c171a958c0529408b7827507c3,b06db670ca16e29b0ca77048f6a106359320b352..4606dacdbc3e9009d5b46e520fe157ac3932bc73
--- 1/templates/base.html
--- 2/templates/base.html
+++ b/templates/base.html
@@@ -99,11 -100,12 +100,12 @@@
                                        <ul class="nav navbar-nav navbar-right">
                                                <li><a href="{{link("")}}">Home</a></li>
                                                {{menulink("about", "About")}}
 -                                              <!-- {{menulink("blog", "Blog")}} -->
 -                                              <!-- <li><a href="{{pguslink("events/schedule/pgopen2018/")}}">Schedule</a></li> -->
 -                                              <!-- <li><a href="{{pguslink("events/feedback/pgopen2018/")}}">Feedback</a></li> -->
 -                                              {{menulink("callforpapers", "Call for Papers")}}
 +                                              {{menulink("blog", "Blog")}}
 +                                              <!-- <li><a href="https://postgresql.us/events/schedule/pgopen2018/">Schedule</a></li> -->
 +                                              <!-- <li><a href="https://postgresql.us/events/feedback/pgopen2018/">Feedback</a></li> -->
 +                                              {{menulink("callforpapers", "CFP")}}
+                                               {{menulink("tickets", "Registration")}}
 -                                              {{menulink("venue", "Venue")}}
 +                                              {{menulink("venue", "Venue & Hotel")}}
                                                {{menulink("becomesponsor", "Become a Sponsor")}}
                                                {{menulink("sponsors", "Sponsors")}}
                                        </ul>

diff --cc templates/context.json
index ff437ecdd987151f2490a8d100f656ed0411bddf,8b6380d89ae591bbe3bfbd5cfee025ed2e205be4..b7fe403db6564d38111d46f43d5c01ba645c1156
--- 1/templates/context.json
--- 2/templates/context.json
+++ b/templates/context.json
@@@ -1,15 -1,8 +1,15 @@@
  {
      "linkbase": "https://2018.postgresopen.org/",
      "mediabase": "https://2018.postgresopen.org/",
- 
 +    "blogposts": [
 +    {
 +    "title": "PostgresOpen Early Bird Registration now Open",
 +    "sponsorname": "PostgresOpen",
 +    "posttime": "2018-06-07",
 +      "content":"<p>We are getting into swing with all things PostgresOpen SV 2018, theU.S. PostgreSQL Community Conference, running September 5-7 2018 inlovely downtown San Francisco.</p><p>The Call For Papers for PostgresOpen SV 2018 is open, but closing soon!</p><p>If you are working with PostgreSQL, please go here and submit a talk!</p><a href=\"https://2018.postgresopen.org/callforpapers/\">https://2018.postgresopen.org/callforpapers/</a><p>The CFP closes on Tuesday, June 12.  We are looking for talks on allthings PostgreSQL from Case Studies and experiences to New Features,Benchmarks, Existing Features, Data Science and Analysis, and everythingin between.</p><p>Our Call For Sponsors is open!  We have many levels available for allcompanies to be able to sponsor, please review our prospectus and reachout to us about how you can sponsor.</p><a href=\"https://2018.postgresopen.org/becomesponsor/\">https://2018.postgresopen.org/becomesponsor/</a><p>The 2018 PostgresOpen SV Committee looks forward to bringing the bestPostgreSQL presentations and tutorials from speakers around the world toSan Francisco and to connect PostgreSQL users, DBAs, executives,developers, engineers, and our sponsors together!</p><p>PostgresOpen would not be possible without the support of our sponsorsand we extend a special thanks to them:</p><ul><li>Citus Data</li><li>2nd Quadrant</li><li>EnterpriseDB</li></ul><p>Keep an eye on <a href=\"https://2018.postgresopen.org/sponsors/\">https://2018.postgresopen.org/sponsors/</a> for updates.<p>PostgresOpen is an Associated Project of the United States PostgreSQLAssocation (PgUS)!  Without PgUS, we would not be able to run theseconferences each year, nor support the many PUGs around the country, soplease visit <a href=\"https://postgresql.us\">https://postgresql.us</a> and consider becoming a member to helppromote the growth and education of PostgreSQL in the US!</p><p>Speakers will be notified by June 19th, 2018, with the schedule to bepublished once selected speakers have confirmed.</p><p>Early Bird registration for PostgresOpen SV 2018 is now open and will beuntil July 18th.  You can register for the conference now by going to:</p><a href=\"https://2018.postgresopen.org/tickets/\">https://2018.postgresopen.org/tickets/</a><p>If you want to get a head start on reserving your room at the lovely Parc55 in downtown San Francsico you can book it at: <a href=\"https://aws.passkey.com/event/49526018/owner/1150/landing\">https://aws.passkey.com/event/49526018/owner/1150/landing</a><p>Join us in celebrating our 8th conference year!  We look forward to seeingeveryone in San Francisco!</p>Any questions?  Please contact: program2018@postgresopen.org"
 +    }
 +      ],
 -
+     "pgusbase": "https://postgresql.us/",
      "conference": "PostgresOpen 2018",
  
      "diamond": [