4f77004a3c34cc23be70bee9e2e833c339cf943d
max
  Wed May 18 02:00:44 2022 -0700
removing merge conflict markers from a track docs html file, my fault

diff --git src/hg/makeDb/trackDb/human/constraintSuper.html src/hg/makeDb/trackDb/human/constraintSuper.html
index 284de0d..26ce924 100644
--- src/hg/makeDb/trackDb/human/constraintSuper.html
+++ src/hg/makeDb/trackDb/human/constraintSuper.html
@@ -70,55 +70,48 @@
 
 <p>Any specific point mutations of interest can then be researched in the <b>
 MTR All data</b> track. This track contains all of the information from 
 <a href="http://biosig.unimelb.edu.au/mtr-viewer/downloads" target="_blank">
 MTRV2</a> including more than 3 possible scores per base when transcripts overlap.
 A mouse-over on this track shows the ref and alt allele, as well as the MTR score
 and the MTR score percentile. Filters are available for MTR score, False Discovery Rate
 (FDR), MTR percentile, and variant consequence. Items in the track are colored according
 to their MTR percentile:</p>
 <ul>
 <li><b><font color=red>Red items</font></b> MTR percentiles over 75
 <li><b><font color=black>Black items</font></b> MTR percentiles between 50 and 75
 <li><b><font color=green>Green items</font></b> MTR percentiles below 25
 <li><b><font color=blue>Blue items</font></b> No MTR score
 </ul>
-<<<<<<< HEAD
 
 
 <p>
-<<<<<<< HEAD
 <b>Jarvis:</b> Scores were downloaded and converted to a single bigWig file.
 See <a href="https://github.com/ucscGenomeBrowser/kent/blob/master/src/hg/makeDb/doc/hg19.txt" target=_blank>hg19 makeDoc</a> and
 <a href="https://github.com/ucscGenomeBrowser/kent/blob/master/src/hg/makeDb/doc/hg38/jarvis.txt" target=_blank>hg38 makeDoc</a>.
-
 <br>
 
 <b>HMC:</b> Scores were downloaded and converted to .bedGraph files with a
 custom Python script. The bedGraph files were then converted to bigWig files,
 as documented in our <a
 href="https://github.com/ucscGenomeBrowser/kent/blob/master/src/hg/makeDb/doc/hg19.txt"
 target=_blank>makeDoc</a> hg19 build log.  </p>
-=======
 By default, only scores with an MTR percentile over 75 are shown.</p>
 
-=======
-
 <p>
 By default, only scores with an MTR percentile over 75 are shown.</p>
 
->>>>>>> 6a9336c9f65f85b7d9fdcb8627995d2d4d9c06ed
 <h2>Methods</h2>
 
 <h3>HMC</h3> 
 <p>
 Scores were downloaded and converted to .bedGraph files with a custom Python 
 script. The bedGraph files were then converted to bigWig files, as documented in our 
 <a href="https://github.com/ucscGenomeBrowser/kent/blob/master/src/hg/makeDb/doc/hg19.txt" 
 target=_blank>makeDoc</a> hg19 build log.</p>
 <h3>Jarvis</h3> 
 <p>
 Scores were downloaded and converted to a single bigWig file. See 
 <a href="https://github.com/ucscGenomeBrowser/kent/blob/master/src/hg/makeDb/doc/hg19.txt" 
 target=_blank>hg19 makeDoc</a> and  <a 
 href="https://github.com/ucscGenomeBrowser/kent/blob/master/src/hg/makeDb/doc/hg38/jarvis.txt" 
 target=_blank>hg38 makeDoc</a></p>