# Conflicts:
#	CHANGELOG.md
#	src/GraphQl/Serializer/ItemNormalizer.php
#	src/GraphQl/composer.json
#	src/Hal/composer.json
#	src/JsonApi/Tests/Serializer/ItemNormalizerTest.php
#	src/JsonApi/composer.json