fixing biblio
fixing a merge conflict and fixing bibliography