update before merge to new server