merge server / game files