HQ and Noise tower no longer herd or farm milk
Fix merge conflict