diff --git a/app/views/catalog/_home_text.html.erb b/app/views/catalog/_home_text.html.erb
index f042e3cd..1871ec15 100644
--- a/app/views/catalog/_home_text.html.erb
+++ b/app/views/catalog/_home_text.html.erb
@@ -2,43 +2,7 @@
 
   <h3><span class="heading inline">POD (Platform for Open Discovery)</span> &nbsp;proof of concept test instance</h3>
   <ul>
-<<<<<<< HEAD
     <li><span>This proof-of-concept test interface is intended only for testing by librarians and showcasing shared indexing issues. It does not represent an end-user experience. We used Penn’s blacklight-test instance to load the data, so it does have some of the end-user UI of the Franklin catalog, but that was just for speed and convenience of getting a demo running.</span></li>
-=======
-    <li><span>Find print books, ebooks, journal and newspaper titles, sound recordings, videos, conference proceedings, music scores, manuscripts, and other resources owned or subscribed to by the Penn Libraries.</span></li>
-    <li><span>See location and status information for print works, and links to online materials.</span></li>
-    <li><span>Place requests (when logged in).</span></li>
-    <li><span>Find and access public-domain books and journals from <a href="https://www.hathitrust.org/">HathiTrust</a>.</span></li>
-  </ul>
-
-  <h3 class="heading">Other Penn Resources</h3>
-
-  <ul>
-
-    <li><span>Use <a href="https://www.library.upenn.edu/#articles">Franklin: Articles+</a> to search for individual articles.</span></li>
-
-    <li><span>Use <a class="article-finder-link">Penn<span class="minishield">&nbsp;&nbsp;&nbsp;</span>Text Article Finder</a> to find content subscribed to by Penn Libraries.</span></li>
-
-    <li><span><a href="https://franklin.library.upenn.edu/catalog?f%5Bformat_f%5D%5B%5D=Database+%26+Article+Index">Browse databases by subject</a>.</span></li>
-
-    <li><span><a href="http://library.artstor.org/">Image collections</a>.</span></li>
-
-    <li><span>Rare books, manuscripts, and other <a href="http://www.library.upenn.edu/kislak/">special collections</a>.</span></li>
-
-    <li><span><a href="http://lola.law.upenn.edu/">LOLA</a> (Biddle Law Library Catalog).</span></li>
-
-  </ul>
-
-
-  <h3 class="heading">Search and Request from Other Libraries</h3>
-
-  <ul>
-
-    <li><span><a href="https://franklin.library.upenn.edu/forms/resourcesharing">BorrowDirect/E-ZBorrow</a> (Search multiple library collections simultaneously).</span></li>
-
-    <li><span><a href="http://hdl.library.upenn.edu/1017/7158">WorldCat</a> (Union catalog of the holdings of libraries worldwide).</span></li>
-
->>>>>>> 4e1331c... update database a-z list url
   </ul>
 
 </section>