fix table
marge conflicts