Remove Conflict Markers #8412

Job	Run time
Test Against Snapshots (17, 17) / Test	9m 11s
Test Against Snapshots (21-ea, 21) / Test	8m 53s
Build (ubuntu-latest, 17) / Build	8m 51s
Check Samples	12m 41s
Build (windows-latest, 17) / Build	13m 0s
Deploy Docs / Deploy Docs	1m 7s
Deploy Schema / Deploy Schema	14m 54s
Deploy Artifacts / Deploy Artifacts	1m 33s
Send Notification	4s
Perform Release	-1s
	1h 10m 13s

Provide feedback