Modify presentation and paper
merge conflicts