diff --git a/index_impl.go b/index_impl.go
index 9ddc9efb9..0540548dc 100644
--- a/index_impl.go
+++ b/index_impl.go
@@ -717,11 +717,7 @@ func LoadAndHighlightFields(hit *search.DocumentMatch, req *SearchRequest,
 	if len(req.Fields) > 0 || highlighter != nil {
 		doc, err := r.Document(hit.ID)
 		if err == nil && doc != nil {
-<<<<<<< HEAD
 			if len(req.Fields) > 0 && hit.Fields == nil {
-=======
-			if len(req.Fields) > 0 {
->>>>>>> origin/master
 				totalStoredFieldsBytes = doc.StoredFieldsBytes()
 				fieldsToLoad := deDuplicate(req.Fields)
 				for _, f := range fieldsToLoad {