added LSST back
collaboration added
fixed conflict