# Conflicts:
#	CHANGELOG.md
#	src/JsonLd/Serializer/ItemNormalizer.php
#	src/Metadata/Tests/Property/Factory/SerializerPropertyMetadataFactoryTest.php
#	src/Serializer/AbstractItemNormalizer.php
#	src/Symfony/Bundle/Resources/config/jsonld.php