tomato gene names as valid input
git conflict solve