fix docs on GENOME_HOME environment variable: merge conflict cruft in the docs
Merge remote-tracking branch upstream/$:{upbranch}