merged bibtex with andremm's