diff --git a/Core/build.gradle b/Core/build.gradle
index 2327ddf81..af9efd311 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -26,14 +26,14 @@ task createPom {
         pom {
             project {
                 groupId 'com.github.intellectualsites.plotsquared'
-                artifactId 'Plotsquared'
+                artifactId 'Plotsquared-Api'
                 version project.parent.version
             }
         }.writeTo("../mvn/com/github/intellectualsites/plotsquared/Plotsquared-Api/${project.parent.version}/Plotsquared-Api-${project.parent.version}.pom")
         pom {
             project {
                 groupId 'com.github.intellectualsites.plotsquared'
-                artifactId 'Plotsquared'
+                artifactId 'Plotsquared-Api'
                 version 'latest'
             }
         }.writeTo("../mvn/com/github/intellectualsites/plotsquared/Plotsquared-Api/latest/Plotsquared-Api-latest.pom")
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
index 1f7f6a88d..281e35caf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -224,6 +224,7 @@ public class Settings extends Config {
 
     @Comment("General settings") public static final class General {
         @Comment("Display scientific numbers (4.2E8)") public static boolean SCIENTIFIC = false;
+        @Comment("Replace wall when merging") public static boolean MERGE_REPLACE_WALL = true;
     }
 
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index 988a6a7b4..fffe38966 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -1,5 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.generator;
 
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
@@ -433,6 +434,10 @@ public class ClassicPlotManager extends SquarePlotManager {
     @Override public boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
         final BlockBucket block = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
         plotIds.forEach(id -> setWall(plotArea, id, block));
+        if (Settings.General.MERGE_REPLACE_WALL) {
+            final BlockBucket wallBlock = ((ClassicPlotWorld) plotArea).WALL_FILLING;
+            plotIds.forEach(id -> setWallFilling(plotArea, id, wallBlock));
+        }
         return true;
     }