From 609f7921ada9a05ff1ff279754a5dad71784b9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nil=20Portugu=C3=A9s=20Calder=C3=B3?=
 <nil.portugues@bandit.io>
Date: Tue, 4 Apr 2017 13:40:53 +0200
Subject: [PATCH] fixing my merge

---
 src/Helpers/DataIncludedHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Helpers/DataIncludedHelper.php b/src/Helpers/DataIncludedHelper.php
index fa9eb9a..750170c 100644
--- a/src/Helpers/DataIncludedHelper.php
+++ b/src/Helpers/DataIncludedHelper.php
@@ -95,7 +95,7 @@ protected static function addToRelationshipsArray(
         foreach ($value as $propertyName => $attribute) {
             if (PropertyHelper::isAttributeProperty($mappings, $propertyName, $type)) {
 
-                $propertyName = DataAttributesHelper::transformToValidMemberName($propertyName);
+		$propertyName = DataAttributesHelper::transformToValidMemberName(RecursiveFormatterHelper::camelCaseToUnderscore($propertyName));
                 if (\array_key_exists(Serializer::MAP_TYPE, $attribute)
                     && count(array_values($attribute[Serializer::SCALAR_VALUE])) > 0
                     && \array_key_exists(Serializer::CLASS_IDENTIFIER_KEY, array_values($attribute[Serializer::SCALAR_VALUE])[0])) {