added table.xhtml
fixed conflicts
fixed conflicts