Update doc
Fix doc
Fixing conflict in global.bib