cdef2b15264dbbc0365542023e770d28e4855e38
Merge parents 59ee91e 260c244
dschmelt
  Tue May 26 10:53:34 2020 -0700
Fixing merge conflict #25130

diff --cc src/hg/htdocs/indexNews.html
index a331988,d6ff9fe..4369977
--- src/hg/htdocs/indexNews.html
+++ src/hg/htdocs/indexNews.html
@@@ -2,32 -2,34 +2,34 @@@
  
    <div class="jwNewsItem jwSingleLineRightColumn">
    __DATE__ -
    <a href="goldenPath/newsarch.html#__MMDDYY__">
      __HEADLINE__
    </a></div>
  
    1. Replace __DATE__ with something like 'Apr. 29, 2016'
    2. Replace __MMDDYY__ with something like '042916'
    3. Replace __HEADLINE__ with the news item's headline like 'Awesome New Feature'
       Be sure to follow the CORRECT STYLE for the headline: 
          - capitalize first letter of headline - no other caps except for proper nouns and acronyms
          - check that headline char count doesn't exceed the line length (otherwise will truncate)
    4. Drop the bottom item from the list (limit of 3 items at a time)
  -->
--  <div class="jwNewsItem jwSingleLineRightColumn">
-   May 22, 2020 -
-   <a href="goldenPath/newsarch.html#052220">
-   Updated GENCODE Genes and GTEx Track
+   May 26, 2020 -
+   <a href="goldenPath/newsarch.html#052720">
+   New video: Browser Basics, Part 3
++>>>>>>> 260c24487a0ce4e3e145687e6a1ba65c812f67d5
    </a></div>
  
    <div class="jwNewsItem jwSingleLineRightColumn">
-   May 12, 2020 -
-   <a href="goldenPath/newsarch.html#051220">
-   Coronavirus Browser How-To video
+   May 26, 2020 -
+   <a href="goldenPath/newsarch.html#052620">
+   NCBI RefSeq vertebrate assembly hubs
    </a></div>
  
-   May 6, 2020 -
-   <a href="goldenPath/newsarch.html#050620">
-   Problematic Regions for NGS/Sanger sequencing
+   <div class="jwNewsItem jwSingleLineRightColumn">
+   May 22, 2020 -
+   <a href="goldenPath/newsarch.html#052220">
+   Updated GENCODE Genes and GTEx Track
    </a></div>
  
+