diff --git a/.bazelrc b/.bazelrc
index 0fc5cb866d..250c4aea97 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,3 +1,4 @@
+# ----CONFIG OPTIONS----
 build --flag_alias=with_bop=//ortools/linear_solver:with_bop
 build --flag_alias=with_cbc=//ortools/linear_solver:with_cbc
 build --flag_alias=with_clp=//ortools/linear_solver:with_clp
@@ -9,3 +10,6 @@ build --flag_alias=with_scip=//ortools/linear_solver:with_scip
 
 build --flag_alias=with_cplex=//ortools/linear_solver:with_cplex
 build --flag_alias=with_xpress=//ortools/linear_solver:with_xpress
+
+# Put user-specific options in .bazelrc.user
+try-import %workspace%/.bazelrc.user
diff --git a/examples/cpp/BUILD.bazel b/examples/cpp/BUILD.bazel
index b0eb4ffbdb..2f7b869f75 100644
--- a/examples/cpp/BUILD.bazel
+++ b/examples/cpp/BUILD.bazel
@@ -463,7 +463,6 @@ cc_binary(
     ],
 )
 
-
 cc_binary(
     name = "shift_minimization_sat",
     srcs = [