fixed static variable, getComputerField fix
fixed merge