diff --git a/src/noggit/MapTile.cpp b/src/noggit/MapTile.cpp
index 5c63c77c..bee9975d 100755
--- a/src/noggit/MapTile.cpp
+++ b/src/noggit/MapTile.cpp
@@ -1225,7 +1225,7 @@ QImage MapTile::getAlphamapImage(std::string const& filename)
   return std::move(image);
 }
 
-<<<<<<<<< Temporary merge branch 1
+void MapTile::setHeightmapImage(QImage const& baseimage, float multiplier, int mode, bool tiledEdges) // image
 {
   auto image = baseimage.convertToFormat(QImage::Format_Grayscale16);
 
@@ -1448,7 +1448,7 @@ QImage MapTile::getVertexColorsImage()
   return std::move(image);
 }
 
-<<<<<<<<< Temporary merge branch 1
+void MapTile::setVertexColorImage(QImage const& baseimage, int mode, bool tiledEdges)
 {
   QImage image = baseimage.convertToFormat(QImage::Format_RGBA8888);
 
diff --git a/src/noggit/MapView.cpp b/src/noggit/MapView.cpp
index c1af9068..2fbc2fba 100755
--- a/src/noggit/MapView.cpp
+++ b/src/noggit/MapView.cpp
@@ -1827,6 +1827,7 @@ void MapView::setupAssistMenu()
             makeCurrent();
             OpenGL::context::scoped_setter const _(::gl, context());
             NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eCHUNKS_TERRAIN);
+            _world->importAllADTsHeightmaps(adt_import_height_params_multiplier->value(), adt_import_height_params_mode->currentIndex(), adt_import_height_tiled_edges->isChecked());
             NOGGIT_ACTION_MGR->endAction();
         )
 
@@ -1845,6 +1846,7 @@ void MapView::setupAssistMenu()
           makeCurrent();
           OpenGL::context::scoped_setter const _(::gl, context());
           NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eCHUNKS_VERTEX_COLOR);
+          _world->importAllADTVertexColorMaps(adt_import_vcol_params_mode->currentIndex(), adt_import_vcol_params_mode_tiled_edges->isChecked());
           NOGGIT_ACTION_MGR->endAction();
       )