diff --git a/CHANGELOG-ATTESTORS.md b/CHANGELOG-ATTESTORS.md
new file mode 100644
index 00000000..5495c052
--- /dev/null
+++ b/CHANGELOG-ATTESTORS.md
@@ -0,0 +1,22 @@
+# Attestor Changelog
+
+## Product attestor
+
+### `v0.2`
+
+Type: https://witness.dev/attestations/product
+Version: `v0.2`
+
+- Attestor configuration has been added as `configuration`.
+- Products has been put into its own `products` field.
+
+
+## Material attestator
+
+### `v0.2`
+
+Type: https://witness.dev/attestations/product
+Version: `v0.2`
+
+- Attestor configuration has been added as `configuration`.
+- Material has been put into its own `materials` field.
\ No newline at end of file
diff --git a/attestation/material/material.go b/attestation/material/material.go
index 8f61d117..c72f25e1 100644
--- a/attestation/material/material.go
+++ b/attestation/material/material.go
@@ -22,11 +22,8 @@ import (
 	"github.com/in-toto/go-witness/attestation"
 	"github.com/in-toto/go-witness/attestation/file"
 	"github.com/in-toto/go-witness/cryptoutil"
-<<<<<<< HEAD
-	"github.com/invopop/jsonschema"
-=======
 	"github.com/in-toto/go-witness/registry"
->>>>>>> 4797229 (feat: Add material incl/excl glob)
+	"github.com/invopop/jsonschema"
 )
 
 const (