Errant mergeconflict
Errant mergeconflict

GMOD/jbrowse,nathandunn/jbrowse,GMOD/jbrowse,GMOD/jbrowse,nathandunn/jbrowse,nathandunn/jbrowse,nathandunn/jbrowse,GMOD/jbrowse,nathandunn/jbrowse,GMOD/jbrowse