Fix

Author: schmidt-sebastian

firebase-firestore/src/main/java/com/google/firebase/firestore/local/DocumentOverlayCache.java

@@ -60,11 +60,13 @@ public interface DocumentOverlayCache {
   /**
    * Returns {@code count} overlays with a batch ID higher than {@code sinceBatchId} for the
    * provided collection group, processed by ascending batch ID. The method always returns all
-   * overlays for a batch even if a batch contains more documents than the remaining limit.
+   * overlays for a batch even if the last batch contains more documents than the remaining limit.
    *
    * @param collectionGroup The collection group to get the overlays for.
    * @param sinceBatchId The minimum batch ID to filter by (exclusive). Only overlays that contain a
    *     change past `sinceBatchId` are returned.
+   * @param count The number of overlays to return. Can be exceeded if the last batch contains more
+   *     entries.
    * @return Mapping of each document key in the collection group to its overlay.
    */
   Map<DocumentKey, Overlay> getOverlays(String collectionGroup, int sinceBatchId, int count);

firebase-firestore/src/test/java/com/google/firebase/firestore/local/DocumentOverlayCacheTestCase.java

@@ -153,7 +153,6 @@ public void testGetAllOverlaysSinceBatchId() {
     verifyOverlayContains(overlays, "coll/doc3", "coll/doc4");
   }
 
-<<<<<<< HEAD
   @Test
   public void testGetAllOverlaysFromCollectionGroupEnforcesCollectionGroup() {
     saveOverlays(2, "coll1/doc1", "coll2/doc1");
@@ -192,8 +191,6 @@ public void testGetAllOverlaysFromCollectionGroupWithLimitIncludesFullBatches()
     verifyOverlayContains(overlays, "coll/doc1", "coll/doc2", "coll/doc3");
   }
 
-=======
->>>>>>> @{-1}
   void verifyOverlayContains(Map<DocumentKey, Overlay> overlays, String... keys) {
     Set<DocumentKey> expected = Arrays.stream(keys).map(TestUtil::key).collect(Collectors.toSet());
     assertThat(overlays.keySet()).containsExactlyElementsIn(expected);