Harvesters now require resources
resolved merge conflicts in Player class