[fix] Another attempt at correctly merging data