add oo-dynamic sortable table
resolved conflicts