diff --git a/jOOQ/src/main/java/org/jooq/InsertOnConflictWhereStep.java b/jOOQ/src/main/java/org/jooq/InsertOnConflictWhereStep.java
index 5a6b791c04..616e0a0286 100644
--- a/jOOQ/src/main/java/org/jooq/InsertOnConflictWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertOnConflictWhereStep.java
@@ -48,6 +48,7 @@ import static org.jooq.SQLDialect.H2;
 import static org.jooq.SQLDialect.MARIADB;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
+// ...
 import static org.jooq.SQLDialect.SQLITE;
 // ...
 
diff --git a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java
index bfc9e13b64..8ab1196c81 100644
--- a/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertOnDuplicateSetStep.java
@@ -37,9 +37,6 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
-
-
 // ...
 // ...
 // ...
@@ -55,6 +52,7 @@ import static org.jooq.SQLDialect.MARIADB;
 import static org.jooq.SQLDialect.MYSQL;
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
+// ...
 import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...
@@ -62,6 +60,8 @@ import static org.jooq.SQLDialect.SQLITE;
 
 import java.util.Map;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * This type is used for the {@link Insert}'s DSL API.
  * <p>
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 00ba5fde3c..130ab22721 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -1485,6 +1485,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
 
 
+
 
 
                 case CUBRID: