Adding table to index
Solving merge conflicts