fixed urls in bib, resolved a conflict in intro
fixed a conflict in intro