Update farm.init
Merge