diff --git a/Mesh_3/demo/Mesh_3/Scene_implicit_function_item.h b/Mesh_3/demo/Mesh_3/Scene_implicit_function_item.h
index 5f735148820..9f52009c795 100644
--- a/Mesh_3/demo/Mesh_3/Scene_implicit_function_item.h
+++ b/Mesh_3/demo/Mesh_3/Scene_implicit_function_item.h
@@ -117,7 +117,7 @@ private:
   void compile_shaders();
   void compute_texture(int, int);
 
-public slots:
+public Q_SLOTS:
     void changed();
 };
 
diff --git a/Mesh_3/demo/Mesh_3/Scene_polygon_soup.h b/Mesh_3/demo/Mesh_3/Scene_polygon_soup.h
index b20baf7b366..79e4e30f577 100644
--- a/Mesh_3/demo/Mesh_3/Scene_polygon_soup.h
+++ b/Mesh_3/demo/Mesh_3/Scene_polygon_soup.h
@@ -73,7 +73,7 @@ private:
   void attrib_buffers(QGLViewer*) const;
   void compile_shaders();
 
-public slots:
+public Q_SLOTS:
   void changed();
 
 }; // end class Scene_polygon_soup
diff --git a/Mesh_3/demo/Mesh_3/Scene_polyhedron_item.h b/Mesh_3/demo/Mesh_3/Scene_polyhedron_item.h
index 369c58ddf39..57687a5dbc1 100644
--- a/Mesh_3/demo/Mesh_3/Scene_polyhedron_item.h
+++ b/Mesh_3/demo/Mesh_3/Scene_polyhedron_item.h
@@ -75,7 +75,7 @@ private:
   void attrib_buffers(QGLViewer*) const;
   void compile_shaders();
 
-public slots:
+public Q_SLOTS:
     void changed();
 
 }; // end class Scene_polyhedron_item
diff --git a/Mesh_3/demo/Mesh_3/Scene_segmented_image_item.h b/Mesh_3/demo/Mesh_3/Scene_segmented_image_item.h
index 9ee331dfe5a..edc56f77eaf 100644
--- a/Mesh_3/demo/Mesh_3/Scene_segmented_image_item.h
+++ b/Mesh_3/demo/Mesh_3/Scene_segmented_image_item.h
@@ -78,7 +78,7 @@ private:
   void attrib_buffers(QGLViewer*) const;
   void compile_shaders();
   void draw_Bbox(Bbox bbox, std::vector<float> *vertices);
-public slots:
+public Q_SLOTS:
     void changed();
 #endif // SCENE_SEGMENTED_IMAGE_GL_BUFFERS_AVAILABLE
 };
diff --git a/Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp b/Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
index f12bca2dda5..1620b1f555b 100644
--- a/Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
+++ b/Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
@@ -54,23 +54,18 @@ Scene::erase(int index)
     return -1;
 
   Scene_item* item = entries[index];
-<<<<<<< HEAD
 
  #if QT_VERSION >= 0x050000
   QAbstractListModel::beginResetModel();
-  emit itemAboutToBeDestroyed(item);
+  Q_EMIT itemAboutToBeDestroyed(item);
   delete item;
   entries.removeAt(index);
 
   selected_item = -1;
-  emit updated();
+  Q_EMIT updated();
   QAbstractListModel::endResetModel();
  #else
-
-  emit itemAboutToBeDestroyed(item);
-=======
   Q_EMIT itemAboutToBeDestroyed(item);
->>>>>>> cgal/master
   delete item;
   entries.removeAt(index);