Mainwindow table widget added
Merge conflict resolved