added table to index
resolved conflicts