From 74d5a10f508e89dd8f680fd870821a6ea9579e39 Mon Sep 17 00:00:00 2001
From: Laurent Perron <lperron@google.com>
Date: Fri, 8 Apr 2022 11:01:13 +0200
Subject: [PATCH] minor sync

---
 ortools/sat/linear_constraint_manager.cc | 1 -
 ortools/sat/sat_solver.h                 | 2 ++
 ortools/sat/simplification.cc            | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ortools/sat/linear_constraint_manager.cc b/ortools/sat/linear_constraint_manager.cc
index f79cc34299..773965b435 100644
--- a/ortools/sat/linear_constraint_manager.cc
+++ b/ortools/sat/linear_constraint_manager.cc
@@ -22,7 +22,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/container/btree_map.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/meta/type_traits.h"
 #include "absl/strings/str_cat.h"
diff --git a/ortools/sat/sat_solver.h b/ortools/sat/sat_solver.h
index 6bfa5e4ea8..73f64a2e07 100644
--- a/ortools/sat/sat_solver.h
+++ b/ortools/sat/sat_solver.h
@@ -105,6 +105,8 @@ class SatSolver {
 
   // Adds a clause to the problem. Returns false if the problem is detected to
   // be UNSAT.
+  // If is_safe is false, we will do some basic presolving like removing
+  // duplicate literals.
   //
   // TODO(user): Rename this to AddClause(), also get rid of the specialized
   // AddUnitClause(), AddBinaryClause() and AddTernaryClause() since they
diff --git a/ortools/sat/simplification.cc b/ortools/sat/simplification.cc
index 13e65ce492..c8edbc53dd 100644
--- a/ortools/sat/simplification.cc
+++ b/ortools/sat/simplification.cc
@@ -21,7 +21,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/container/btree_set.h"
 #include "absl/memory/memory.h"
 #include "absl/types/span.h"
 #include "ortools/algorithms/dynamic_partition.h"