messing around with git. woo.

diff --cc 2018/index.html
index 407230e5a5761d0410b658507d614b1ea2f92131,50e3d3278086a57d2396d1d50378625dbe2514fd..6c90b2b867dd1206a56211d28c6460d3eca5b9b7
--- 1/2018/index.html
--- 2/2018/index.html
+++ b/2018/index.html
@@@ -14,11 -14,11 +14,19 @@@
                <li class="item active">
                        <img src="http://static.fsf.org/nosvn/libreplanet/2018/assets/banner_no_year.svg"
                        alt="[ Libreplanet logo, consisting of several stars and connected green planets and the text "LibrePlanet" ]">
++<<<<<<< HEAD
 +                      <p class="carousel-caption-bottom" style="background-color: white;"><br></p>
 +                      </li>
 +                              <li class="item">
 +                              <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
 +                              alt="[ Hackers at the GNU 30th anniversary hackathon ]">
++=======
+               </li>
+                       
+               <li class="item">
+                               <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
+                               alt="[ A photo of people in a room on laptops. They are sitting at desks, with a clean blackboard in the background on one wall, and on the other written on a bloackboard is the text "Installation Feedback." Several of the people have long hair, and one woman's hair is pink and yellow. ]">
++>>>>>>> master
                                <p class="carousel-caption-bottom"><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=33">Donate to the scholarship fund</a> to help us bring new people to LibrePlanet.
                        </p>
                </li>