Dress it

2:15 And the LORD God took the man, and put him into the garden of Eden to dress it and to keep it. 

Back in 2:8, God put man in the garden.  Seven verses later, he did it again.  Maybe man ran away.  Anyway, this time there's a purpose: the garden needs a gardener.

Consistent with this chapter, and inconsistent with the first, we have "LORD God".

Note that there's a continuum between gardener and farmer.  In fact, I'm not sure I can define the distinction between a garden and a farm.