Fixed Data.php merge