@@ -572,7 +572,6 @@
     }
   },
   {
-<<<<<<< HEAD
     "name": "syndication",
     "type": "document",
     "attributes": {
@@ -704,8 +703,6 @@
     }
   },
   {
-=======
->>>>>>> origin/main
     "type": "type",
     "name": "page.reference",
     "value": {
@@ -13645,7 +13642,6 @@
     }
   },
   {
-<<<<<<< HEAD
     "type": "type",
     "name": "media.folder.reference",
     "value": {
@@ -13728,8 +13724,6 @@
     }
   },
   {
-=======
->>>>>>> origin/main
     "name": "media.tag",
     "type": "document",
     "attributes": {
Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,6 @@`
`572`	`572`	`}`
`573`	`573`	`},`
`574`	`574`	`{`
`575`		`-<<<<<<< HEAD`
`576`	`575`	`"name": "syndication",`
`577`	`576`	`"type": "document",`
`578`	`577`	`"attributes": {`
`@@ -704,8 +703,6 @@`
`704`	`703`	`}`
`705`	`704`	`},`
`706`	`705`	`{`
`707`		`-=======`
`708`		`->>>>>>> origin/main`
`709`	`706`	`"type": "type",`
`710`	`707`	`"name": "page.reference",`
`711`	`708`	`"value": {`
`@@ -13645,7 +13642,6 @@`
`13645`	`13642`	`}`
`13646`	`13643`	`},`
`13647`	`13644`	`{`
`13648`		`-<<<<<<< HEAD`
`13649`	`13645`	`"type": "type",`
`13650`	`13646`	`"name": "media.folder.reference",`
`13651`	`13647`	`"value": {`
`@@ -13728,8 +13724,6 @@`
`13728`	`13724`	`}`
`13729`	`13725`	`},`
`13730`	`13726`	`{`
`13731`		`-=======`
`13732`		`->>>>>>> origin/main`
`13733`	`13727`	`"name": "media.tag",`
`13734`	`13728`	`"type": "document",`
`13735`	`13729`	`"attributes": {`