diff --git a/Mesh/Field.cpp b/Mesh/Field.cpp
index 9d559dd56d24194cd0a7a571d8aaaf8b7dcb2ea2..6529ca68009e95ac52f1bbed9aaa2172733a5a92 100644
--- a/Mesh/Field.cpp
+++ b/Mesh/Field.cpp
@@ -11,6 +11,7 @@
 #include <math.h>
 #include <fstream>
 #include <string>
+#include <string.h>
 #include <sstream>
 
 #ifdef HAVE_MATH_EVAL
@@ -946,12 +947,8 @@ class PostViewField : public Field
   OctreePost *octree;
  public:
   int view_index;
-<<<<<<< Field.cpp
   bool crop_negative_values;
-  double operator() (double x, double y, double z)
-=======
   double operator() (double x, double y, double z, GEntity *ge=0)
->>>>>>> 1.56
   {
     // FIXME: should test unique view num instead, but that would be slower
     if(view_index < 0 || view_index >= (int)PView::list.size())