From fab493c42b30873d55d8afce7289a0f92d861f2d Mon Sep 17 00:00:00 2001
From: Matthew Jaffee <jaffee@pilosa.com>
Date: Fri, 22 Dec 2017 11:14:12 -0600
Subject: [PATCH] fix up missed conflict

---
 roaring/roaring.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/roaring/roaring.go b/roaring/roaring.go
index 2de14caf3..367983322 100644
--- a/roaring/roaring.go
+++ b/roaring/roaring.go
@@ -362,12 +362,7 @@ func (b *Bitmap) IntersectionCount(other *Bitmap) uint64 {
 
 // Intersect returns the intersection of b and other.
 func (b *Bitmap) Intersect(other *Bitmap) *Bitmap {
-<<<<<<< 49aec2dc4c2137c459c5ff4902609b93cfc72933
-	output := &Bitmap{}
-=======
 	output := NewBitmap()
-
->>>>>>> fix a bunch of bugs and add some tests
 	iiter, _ := b.conts.Iterator(0)
 	jiter, _ := other.conts.Iterator(0)
 	i, j := iiter.Next(), jiter.Next()