fix table issue
merge