The conflict was about whitesapce Approved by the release manager Conflicts: Polyhedron/include/CGAL/Polyhedron_copy_3.h