solve some bug of struct
merge the file