ecedf964159d3462824e6c23dd03342bbc3f6e9e
max
  Mon Sep 21 00:25:59 2015 -0700
fixing merge conflict overlooked in last commit

diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c
index 2f62645..f3c1061 100644
--- src/hg/hgTracks/hgTracks.c
+++ src/hg/hgTracks/hgTracks.c
@@ -5378,36 +5378,33 @@
    be drawn with names highlighted for easy identification. */
 createHgFindMatchHash();
 
 /* This means that no single result was found
 I.e., multiple results may have been found and are printed out prior to this code*/
 if (NULL == chromName)
     {
     // In case user manually edits the browser location as described in #13009,
     // revert the position.  If they instead choose from the list as we expect,
     // that will set the position to their choice.
     char *lastPosition = cartUsualString(cart, "lastPosition", hDefaultPos(database));
     cartSetString(cart, "position", lastPosition);
     return;
     }
 
-<<<<<<< HEAD
 // save the current position to the cart var position.<db>
 cartSetDbPosition(cart, database, position);
 
-=======
->>>>>>> parent of 385f6d8... adding menu entries under genomes and genome browser, refs #16022
 seqBaseCount = hChromSize(database, chromName);
 winBaseCount = winEnd - winStart;
 
 /* Figure out basic dimensions of display.  This
  * needs to be done early for the sake of the
  * zooming and dinking routines. */
 setLayoutGlobals();
 
 baseShowPos = cartUsualBoolean(cart, BASE_SHOWPOS, FALSE);
 baseShowAsm = cartUsualBoolean(cart, BASE_SHOWASM, FALSE);
 baseShowScaleBar = cartUsualBoolean(cart, BASE_SCALE_BAR, TRUE);
 baseShowRuler = cartUsualBoolean(cart, BASE_SHOWRULER, TRUE);
 safef(titleVar,sizeof(titleVar),"%s_%s", BASE_TITLE, database);
 baseTitle = cartUsualString(cart, titleVar, "");
 if (sameString(baseTitle, ""))