diff --git a/pkg/importer/dataStream.go b/pkg/importer/dataStream.go
index d1c383e50a..931316915b 100644
--- a/pkg/importer/dataStream.go
+++ b/pkg/importer/dataStream.go
@@ -81,7 +81,11 @@ type DataStreamOptions struct {
 	Dest string
 	// Endpoint is the endpoint to get the data from for various Sources.
 	Endpoint string
+<<<<<<< HEAD
 	// AccessKey is the access key for the endpoint, can be blank. This needs to be a base64 encoded string.
+=======
+	// AccessKey is the access key for the endpoint, can be blank.
+>>>>>>> Add source and contentType annotations
 	AccessKey string
 	// SecKey is the security key needed for the endpoint, can be blank.
 	SecKey string