changed server script filename
code merge