diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
index efcf33efe7..02052b5e35 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
@@ -1193,12 +1193,6 @@ implements
     }
 
     private final <T> Condition matchByConflictingKey(Context<?> ctx, Field<T> f, Field<T> v) {
-
-
-
-
-
-
         return f.eq(v);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
index f455204626..51e5d4ff41 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
@@ -64,9 +64,11 @@ import static org.jooq.conf.WriteIfReadonly.THROW;
 import static org.jooq.impl.ConditionProviderImpl.extractCondition;
 import static org.jooq.impl.DSL.condition;
 import static org.jooq.impl.DSL.exists;
+import static org.jooq.impl.DSL.field;
 import static org.jooq.impl.DSL.insertInto;
 import static org.jooq.impl.DSL.noCondition;
 import static org.jooq.impl.DSL.notExists;
+import static org.jooq.impl.DSL.select;
 import static org.jooq.impl.DSL.trueCondition;
 import static org.jooq.impl.DSL.when;
 import static org.jooq.impl.Keywords.K_AND;
@@ -174,6 +176,7 @@ import org.jooq.Record1;
 import org.jooq.SQL;
 import org.jooq.SQLDialect;
 import org.jooq.Select;
+import org.jooq.SelectField;
 import org.jooq.Table;
 import org.jooq.TableLike;
 import org.jooq.UniqueKey;
@@ -1632,6 +1635,21 @@ implements
            .start(MERGE_ON)
            .visit(K_ON).sql(' ');
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+