Bug fixed merging data