diff --git a/xs/MANIFEST b/xs/MANIFEST
index 1ec17eaff9..dc868f678d 100644
--- a/xs/MANIFEST
+++ b/xs/MANIFEST
@@ -1,26 +1,13 @@
-<<<<<<<				HEAD
-=======
->>>>>>>				master
 Build.PL
-buildtmp/main.xs
-buildtmp/typemap
-buildtmp/XS.c
-buildtmp/XS.o
 lib/Slic3r/XS.pm
 MANIFEST			This list of files
 src/admesh/connect.c
-src/admesh/connect.o
 src/admesh/normals.c
-src/admesh/normals.o
 src/admesh/shared.c
-src/admesh/shared.o
 src/admesh/stl.h
 src/admesh/stl_io.c
-src/admesh/stl_io.o
 src/admesh/stlinit.c
-src/admesh/stlinit.o
 src/admesh/util.c
-src/admesh/util.o
 src/boost/aligned_storage.hpp
 src/boost/array.hpp
 src/boost/assert.hpp
@@ -1663,109 +1650,76 @@ src/boost/version.hpp
 src/boost/visit_each.hpp
 src/BoundingBox.cpp
 src/BoundingBox.hpp
-src/BoundingBox.o
 src/clipper.cpp
 src/clipper.hpp
-src/clipper.o
 src/ClipperUtils.cpp
 src/ClipperUtils.hpp
-src/ClipperUtils.o
 src/Config.cpp
 src/Config.hpp
-src/Config.o
 src/ExPolygon.cpp
 src/ExPolygon.hpp
-src/ExPolygon.o
 src/ExPolygonCollection.cpp
 src/ExPolygonCollection.hpp
-src/ExPolygonCollection.o
 src/Extruder.cpp
 src/Extruder.hpp
-src/Extruder.o
 src/ExtrusionEntity.cpp
 src/ExtrusionEntity.hpp
-src/ExtrusionEntity.o
 src/ExtrusionEntityCollection.cpp
 src/ExtrusionEntityCollection.hpp
-src/ExtrusionEntityCollection.o
 src/Flow.cpp
 src/Flow.hpp
-src/Flow.o
 src/GCode.hpp
 src/Geometry.cpp
 src/Geometry.hpp
-src/Geometry.o
 src/Layer.hpp
 src/Line.cpp
 src/Line.hpp
-src/Line.o
 src/Model.cpp
 src/Model.hpp
-src/Model.o
 src/MotionPlanner.cpp
 src/MotionPlanner.hpp
-src/MotionPlanner.o
 src/MultiPoint.cpp
 src/MultiPoint.hpp
-src/MultiPoint.o
 src/myinit.h
 src/perlglue.hpp
 src/Point.cpp
 src/Point.hpp
-src/Point.o
 src/poly2tri/common/shapes.cc
 src/poly2tri/common/shapes.h
-src/poly2tri/common/shapes.o
 src/poly2tri/common/utils.h
 src/poly2tri/poly2tri.h
 src/poly2tri/sweep/advancing_front.cc
 src/poly2tri/sweep/advancing_front.h
-src/poly2tri/sweep/advancing_front.o
 src/poly2tri/sweep/cdt.cc
 src/poly2tri/sweep/cdt.h
-src/poly2tri/sweep/cdt.o
 src/poly2tri/sweep/sweep.cc
 src/poly2tri/sweep/sweep.h
-src/poly2tri/sweep/sweep.o
 src/poly2tri/sweep/sweep_context.cc
 src/poly2tri/sweep/sweep_context.h
-src/poly2tri/sweep/sweep_context.o
 src/Polygon.cpp
 src/Polygon.hpp
-src/Polygon.o
 src/Polyline.cpp
 src/Polyline.hpp
-src/Polyline.o
 src/PolylineCollection.cpp
 src/PolylineCollection.hpp
-src/PolylineCollection.o
 src/polypartition.cpp
 src/polypartition.h
-src/polypartition.o
 src/ppport.h
 src/Print.cpp
 src/Print.hpp
-src/Print.o
 src/PrintConfig.cpp
 src/PrintConfig.hpp
-src/PrintConfig.o
 src/Surface.cpp
 src/Surface.hpp
-src/Surface.o
 src/SurfaceCollection.cpp
 src/SurfaceCollection.hpp
-src/SurfaceCollection.o
 src/SVG.cpp
 src/SVG.hpp
-src/SVG.o
 src/TriangleMesh.cpp
 src/TriangleMesh.hpp
-src/TriangleMesh.o
 src/utils.cpp
-src/utils.o
 src/visilibity.cpp
 src/visilibity.hpp
-src/visilibity.o
 t/01_trianglemesh.t
 t/03_point.t
 t/04_expolygon.t