file system reorientation: save all papers in hd
fix merge conflict