* fix for data merging