reconcile bleed and main

Author: heather999

conda/conda-pack.txt

@@ -18,20 +18,23 @@ extinction
 fast-pt
 fast3tree
 fastparquet
+firecrown
 fitsio
 flake8
 galsim
 gcr
 google-cloud-bigquery  
 graphviz
-gsl==2.7=he838d99_0
+gsl   
+#==2.7=he838d99_0
 h5py=*=mpi*
 hdf5=*=mpi*
 healpy
 healsparse
 holoviews
 ipympl
 jax
+jaxlib
 jupyter
 lsstdesc-coord
 lsstdesc-diffsky