diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java
index 7883427bad..3da4e5e4a7 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/Constants.java
@@ -134,7 +134,7 @@ public final class Constants {
     /**
      * The current jooq-codegen XSD file name.
      */
-    public static final String XSD_CODEGEN    = "jooq-codegen-3.15.0.xsd";
+    public static final String XSD_CODEGEN    = "jooq-codegen-3.16.0.xsd";
 
     /**
      * The current jooq-codegen XML namespace.
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java b/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java
index 49f1e3ddda..f76a6b8c94 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/Constants.java
@@ -134,7 +134,7 @@ public final class Constants {
     /**
      * The current jooq-codegen XSD file name.
      */
-    public static final String XSD_CODEGEN    = "jooq-codegen-3.15.0.xsd";
+    public static final String XSD_CODEGEN    = "jooq-codegen-3.16.0.xsd";
 
     /**
      * The current jooq-codegen XML namespace.
diff --git a/jOOQ/src/main/java/org/jooq/Constants.java b/jOOQ/src/main/java/org/jooq/Constants.java
index 288119975e..adf3d89efb 100644
--- a/jOOQ/src/main/java/org/jooq/Constants.java
+++ b/jOOQ/src/main/java/org/jooq/Constants.java
@@ -134,7 +134,7 @@ public final class Constants {
     /**
      * The current jooq-codegen XSD file name.
      */
-    public static final String XSD_CODEGEN    = "jooq-codegen-3.15.0.xsd";
+    public static final String XSD_CODEGEN    = "jooq-codegen-3.16.0.xsd";
 
     /**
      * The current jooq-codegen XML namespace.
diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
index 9a40595b46..946eee85bf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
@@ -738,9 +738,8 @@ implements
             upsertStyle = true;
             getUpsertValues().addAll(Tools.fields(values, getUpsertFields().toArray(EMPTY_FIELD)));
         }
-        else {
+        else
             getLastNotMatched().insertMap.set(Tools.fields(values, getLastNotMatched().insertMap.fields().toArray(EMPTY_FIELD)));
-        }
 
         return this;
     }