fix merge error for the worldhandler