added gardener list
fixed merge conflicts