diff --git a/core/data.go b/core/data.go
index b3955d910c..eaf5c878f1 100644
--- a/core/data.go
+++ b/core/data.go
@@ -161,7 +161,6 @@ func (cb Bundles) Serialize() ([][][]byte, error) {
 	return data, nil
 }
 
-<<<<<<< HEAD
 // Returns the size of the bundles in bytes.
 func (cb Bundles) Size() int64 {
 	size := int64(0)
@@ -173,9 +172,7 @@ func (cb Bundles) Size() int64 {
 	return size
 }
 
-=======
 // Sample is a chunk with associated metadata used by the Universal Batch Verifier
->>>>>>> organize data struct and add fiat shamir
 type Sample struct {
 	Commitment      *Commitment
 	Chunk           *Chunk