1 files changed, 8 insertions, 0 deletions
diff --git a/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/SourceFileCoverage.java b/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/SourceFileCoverage.java
index 0cdb1a6f85..b98a873a8c 100644
--- a/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/SourceFileCoverage.java
+++ b/tools/test/LcovMerger/java/com/google/devtools/lcovmerger/SourceFileCoverage.java
@@ -237,6 +237,10 @@ class SourceFileCoverage {
   }
 
   void addBranch(Integer lineNumber, BranchCoverage branch) {
+    if (this.branches.get(lineNumber) != null) {
+      this.branches.put(lineNumber, BranchCoverage.merge(this.branches.get(lineNumber), branch));
+      return;
+    }
     this.branches.put(lineNumber, branch);
   }
 
@@ -245,6 +249,10 @@ class SourceFileCoverage {
   }
 
   void addLine(Integer lineNumber, LineCoverage line) {
+    if (this.lines.get(lineNumber) != null) {
+      this.lines.put(lineNumber, LineCoverage.merge(line, this.lines.get(lineNumber)));
+      return;
+    }
     this.lines.put(lineNumber, line);
   }