test done, manual done, bib updated
conflict fix