diff --git a/dune/vtk/vtkreader.impl.hh b/dune/vtk/vtkreader.impl.hh
index 65c3636ed8453a3a6e77ff5786bccbd9206e2d44..e94905f3a0b1d132e90d01026bafca5add4baeeb 100644
--- a/dune/vtk/vtkreader.impl.hh
+++ b/dune/vtk/vtkreader.impl.hh
@@ -3,11 +3,7 @@
 #include <iterator>
 #include <string>
 
-<<<<<<< 0d5e1c63fbeb492af8b00cdfbddbcd516e2805af
-#ifdef HAVE_VTK_ZLIB
-=======
 #if HAVE_VTK_ZLIB
->>>>>>> parallel vtk reader partially implemented
 #include <zlib.h>
 #endif