fixed bib
merge