added model and tableView
conflict fix