update to bibliography
Fixed merge conflicts