updating all the git after several months, changes and new computer
solve conflict with pdf file