finally got this merge working, new bushes and a human controller bug fix, and something with the yams and garlic IDK what