fixed conflict

index.html

@@ -91,7 +91,33 @@ Through the map, we give shape to a common context in Turkish culture. The map a
 
  </div>
       </div><br>
-      <div id="showcolophon" class="draggable"><span onclick="this.parentElement.style.display='none'" class="topleft">&times</span><div>colophon texthjgjhghjgfhdgfhdgfhdsgfhsgfhsgdfjhgdsfhsfgdfjgsfgdshsgfhsgfffffffffffffdfhdsfjsgdfjgjdsgfsjdgfjshgdf</div>
+      <div id="showcolophon" class="draggable"><span onclick="this.parentElement.style.display='none'" class="topleft">&times</span><div><h2>colophon</h2>
+Wells of Knowledge: Poetry, music and resistance in Turkey © 2020<br>
+at.wdka.nl/wellsofknowledge<br>
+Developed by Hybrid Publishing,<br>
+Willem de Kooning Academy<br>
+Text and images © Merve Kılıçer<br>
+All rights reserved<br>
+ISBN: XXXX<br>
+Author: Merve Kılıçer<br>
+Graphic Design &amp; Web Development: Angeliki Diakrousi and Alice Strete<br>
+Editor: Liz Allan<br>
+Coordination: Kimmy Spreeuwenberg<br>
+[@Merve - ADD THANK YOU MESSAGE HERE]<br>
+Hybrid Publishing<br>
+This publication was developed by Hybrid Publishing, founded by the Willem de Kooning
+Academy as a means of profiling and disseminating outstanding research conducted by its
+students and teaching staff, whether independently or in collaboration with external
+partners. Researching and experimenting across a broad range of processes native to digital
+and analog media, WdKA Hybrid Publishing fosters novel approaches to design, authoring,
+reading and dissemination made possible through ongoing developments from the legacies
+of Gutenberg’s press to present-day technologies. (hybridpublishing.wdka.nl)<br>
+HP Research Awards<br>
+The HP Research Awards series showcases the work of recipients or nominees of the Willem
+de Kooning Research Award. Established by the Willem de Kooning Foundation, the awards
+are granted to outstanding students whose graduation projects and research have helped
+provide new insights to broader audiences. For a digital version of this and other
+publications, go to at.wdka.nl/hpresearchawards</div>
       </div>
 
       <div id="showhow" class="draggable"><span onclick="this.parentElement.style.display='none'" class="topleft">&times</span><div><h2>How to use</h2><p>

static/css/style.css

@@ -44,15 +44,13 @@ body {
   font-size: 20px;
   margin-left: 50px;
   margin-top: 15px;
-
 }
+
+
 #noflex {
   display: block;
 }
 .map_area {
-  text-align: center;
-  /* margin-top: 20px; */
-  /* margin-bottom: 20px; */
   margin-right: 10px;
   margin-left: 20px;
   position: relative;