modified gardenlist tableview
resolve merge confilicts