Comment in data_add for the merge
Correct data_add after merge