fixing conflict in paper.bib