Actually merge the data properly