table add, content, font
fixes merge
fixed conflicts