fixing merge problems

diff --cc header.php
index 20029a8,b603f92..ddfa983
--- 1/header.php
--- 2/header.php
+++ b/header.php
@@@ -28,7 -28,8 +28,7 @@@
                                      <h1>Petoskey, Michigan 49770</h1>
                                      <h1>Reservations: 888-321-2500 - <a target="_blank" href="https://reservation.magnusonhotels.com/bbe/page1.aspx?propertyID=6386">Book Online</a></h1>
                                      <h2>FOR ADDITIONAL AVAILABILITY, CALL HOTEL DIRECT</h2>
-                                 </hgroup>
+                                 </hgroup>    
 -                                    
                              </div>
                          </div>
                      </header>