update data.c
merge